From 438c0d5fc92af05ebfb710f171dd81213ae4918f Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Sun, 27 Oct 2024 18:23:01 +0000 Subject: [PATCH] Access correct variables and update version --- .github/workflows/code_coverage.yml | 12 ++++++------ .github/workflows/documentation.yml | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 72ce9884..aa89dd50 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -46,17 +46,17 @@ jobs: - uses: actions/checkout@v4.1.1 - name: Cache Conan data - uses: actions/cache@v3.3.2 + uses: actions/cache@v4.1.2 env: cache-name: cache-conan-data with: path: ${{github.workspace}}/conan_cache_save.tgz - key: ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}-${{ matrix.configuration }}-${{ matrix.settings.compiler.conan }}-${{ matrix.settings.compiler.version }}-${{ matrix.settings.lib }} + key: ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}-${{ env.STDLIB }} restore-keys: | - ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}-${{ matrix.configuration }}-${{ matrix.settings.compiler.conan }}-${{ matrix.settings.compiler.version }}- - ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}-${{ matrix.configuration }}-${{ matrix.settings.compiler.conan }}- - ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}-${{ matrix.configuration }}- - ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}- + ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}- + ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}- + ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}-${{ env.BUILD_TYPE }}- + ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}- # Previously GCC was installed via egor-tensin/setup-gcc@v1 but this does not install gcov with the compiler. # By default Ubuntu has Gcov 11 installed. This worked so long as the compiler was gcc 11, but if a later gcc was diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 2fc4eff1..b6085b74 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -44,17 +44,18 @@ jobs: - uses: actions/checkout@v4.1.1 - name: Cache Conan data - uses: actions/cache@v3.3.2 + uses: actions/cache@v4.1.2 env: cache-name: cache-conan-data with: path: ${{github.workspace}}/conan_cache_save.tgz - key: ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}-${{ matrix.configuration }}-${{ matrix.settings.compiler.conan }}-${{ matrix.settings.compiler.version }}-${{ matrix.settings.lib }} + key: ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}-${{ env.STDLIB }}-documentation restore-keys: | - ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}-${{ matrix.configuration }}-${{ matrix.settings.compiler.conan }}-${{ matrix.settings.compiler.version }}- - ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}-${{ matrix.configuration }}-${{ matrix.settings.compiler.conan }}- - ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}-${{ matrix.configuration }}- - ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.settings.os }}- + ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}-${{ env.STDLIB }} + ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}- + ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}- + ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}-${{ env.BUILD_TYPE }}- + ${{ hashFiles('**/conanfile.py') }}-build-${{ matrix.os }}- - name: Install Latest GCC uses: egor-tensin/setup-gcc@v1.3