Use the new way to activate the download cache

This commit is contained in:
Dmitry Vedenko 2022-11-08 23:57:18 +03:00
parent 3a66549164
commit f3361aa96a
No known key found for this signature in database
GPG Key ID: F4C37A6204F983A2
3 changed files with 7 additions and 4 deletions

File diff suppressed because one or more lines are too long

View File

@ -10,7 +10,7 @@ const generator = core.getInput('generator') || 'Unix Makefiles';
const buildType = core.getInput('build_type') || 'Release';
async function run() {
await offlineDependencies.prepareEnvironment();
cachePath = await offlineDependencies.prepareEnvironment();
const tempPath = path.join(workspaceDir, '.offline', 'temp');
@ -21,6 +21,7 @@ async function run() {
'-G', generator,
'-D', 'audacity_conan_allow_prebuilt_binaries=no',
'-D', 'audacity_conan_force_build_dependencies=yes',
'-D', `audacity_conan_download_cache=${cachePath}`,
'-D', `CMAKE_BUILD_TYPE=${buildType}`,
'-D', `CMAKE_CONFIGURATION_TYPES=${buildType}`,
...core.getMultilineInput('cmake_options')

View File

@ -53,8 +53,10 @@ async function prepareEnvironment() {
'update',
'settings.compiler.libcxx=libstdc++11',
'default',
])
]);
}
return conanDownloadCacheLocation;
}
async function upload() {