audacity/audacity-actions
1
0
Fork 0
mirror of https://github.com/audacity/audacity-actions.git synced 2025-12-10 03:56:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Do not fail if conan remote is already present

Browse Source
This commit is contained in:
Dmitry Vedenko 2022-12-28 14:32:24 +03:00
parent 91c5df95c0
commit 2cdecf548e
No known key found for this signature in database
GPG Key ID: F4C37A6204F983A2
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/configure/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/update_recipes/index.js vendored
View File

File diff suppressed because one or more lines are too long

9
lib/conan.js
View File

@ -31,7 +31,7 @@ async function getCompilerVersion(generator) {
async function getConanCacheKeys(generator) {
const depsFile = path.join(workspaceDir, 'cmake-proxies/CMakeLists.txt');
const depsMD5 = helpers.getMD5(depsFile);
const conanVersion = await getConanVersion();
const conanCacheKeyShort = [
@ -66,8 +66,11 @@ async function uploadBinaries() {
const remote = process.env['CONAN_BINARIES_REMOTE'];
if (remote) {
await helpers.execWithLog(`conan remote add audacity-binaries-upload ${remote} true --force`);
await helpers.execWithLog(`conan upload "*" -r audacity-binaries-upload -c --all`);
try {
await helpers.execWithLog(`conan remote add audacity-binaries-upload ${remote} true --force`);
} finally {
await helpers.execWithLog(`conan upload "*" -r audacity-binaries-upload -c --all`);
}
}
}