Tweak cache path, update cache name

This commit is contained in:
Dan Paulat 2025-03-16 20:55:15 -05:00
parent f7ee395eba
commit e667155cd5
2 changed files with 4 additions and 10 deletions

View file

@ -33,7 +33,6 @@ jobs:
qt_arch_dir: msvc2022_64 qt_arch_dir: msvc2022_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
qt_tools: '' qt_tools: ''
conan_path: '%USERPROFILE%\.conan2'
conan_package_manager: '' conan_package_manager: ''
conan_profile: scwx-win64_msvc2022 conan_profile: scwx-win64_msvc2022
appimage_arch: '' appimage_arch: ''
@ -49,7 +48,6 @@ jobs:
qt_arch_dir: gcc_64 qt_arch_dir: gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
qt_tools: '' qt_tools: ''
conan_path: '~/.conan2'
conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
conan_profile: scwx-linux_gcc-11 conan_profile: scwx-linux_gcc-11
appimage_arch: x86_64 appimage_arch: x86_64
@ -66,7 +64,6 @@ jobs:
qt_arch_dir: gcc_64 qt_arch_dir: gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
qt_tools: '' qt_tools: ''
conan_path: '~/.conan2'
conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
conan_profile: scwx-linux_clang-17 conan_profile: scwx-linux_clang-17
appimage_arch: x86_64 appimage_arch: x86_64
@ -83,7 +80,6 @@ jobs:
qt_arch_dir: gcc_arm64 qt_arch_dir: gcc_arm64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
qt_tools: '' qt_tools: ''
conan_path: '~/.conan2'
conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
conan_profile: scwx-linux_gcc-11_armv8 conan_profile: scwx-linux_gcc-11_armv8
appimage_arch: aarch64 appimage_arch: aarch64
@ -140,8 +136,8 @@ jobs:
- name: Cache Conan Packages - name: Cache Conan Packages
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: ${{ matrix.conan_path }} path: ~/.conan2
key: ${{ matrix.name }}-build-${{ matrix.conan_profile }}-${{ hashFiles('./source/conanfile.py', './source/tools/conan/profiles/*') }} key: build-${{ matrix.conan_profile }}-${{ hashFiles('./source/conanfile.py', './source/tools/conan/profiles/*') }}
- name: Install Conan Packages - name: Install Conan Packages
shell: pwsh shell: pwsh

View file

@ -24,8 +24,6 @@ jobs:
qt_arch_aqt: linux_gcc_64 qt_arch_aqt: linux_gcc_64
qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport qt_modules: qtimageformats qtmultimedia qtpositioning qtserialport
qt_tools: '' qt_tools: ''
conan_cache_name: linux_clang_x64
conan_path: '~/.conan2'
conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True conan_package_manager: --conf tools.system.package_manager:mode=install --conf tools.system.package_manager:sudo=True
conan_profile: scwx-linux_clang-17 conan_profile: scwx-linux_clang-17
compiler_packages: clang-17 clang-tidy-17 compiler_packages: clang-17 clang-tidy-17
@ -77,8 +75,8 @@ jobs:
- name: Cache Conan Packages - name: Cache Conan Packages
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: ${{ matrix.conan_path }} path: ~/.conan2
key: ${{ matrix.conan_cache_name }}-build-${{ matrix.conan_profile }}-${{ hashFiles('./source/conanfile.py', './source/tools/conan/profiles/*') }} key: build-${{ matrix.conan_profile }}-${{ hashFiles('./source/conanfile.py', './source/tools/conan/profiles/*') }}
- name: Install Conan Packages - name: Install Conan Packages
shell: pwsh shell: pwsh