From 02ac65574a6b9b97e6720dd81257ea1542930e58 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 24 Apr 2021 11:43:04 +0300 Subject: workflows: fix cache path Forgot to switch to $RUNNER_WORKSPACE/build in the workflows also. Also, the usual crap with the cache action made me change the cache keys, or it would be restore in the wrong location for some reason. --- .github/workflows/basic.yml | 2 +- .github/workflows/boost_clang_windows.yml | 2 +- .github/workflows/boost_toolsets.yml | 2 +- .github/workflows/ci_appveyor.yml | 4 ++-- .github/workflows/ci_github.yml | 4 ++-- .github/workflows/ci_travis.yml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index a0977e8..8d8d9f3 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -50,7 +50,7 @@ jobs: uses: actions/cache@v2.1.4 with: path: boost_*.tar.gz - key: boost-1.72.0 + key: boost_1.72.0 - name: Build Boost run: | diff --git a/.github/workflows/boost_clang_windows.yml b/.github/workflows/boost_clang_windows.yml index 92e3ced..66fea9e 100644 --- a/.github/workflows/boost_clang_windows.yml +++ b/.github/workflows/boost_clang_windows.yml @@ -37,7 +37,7 @@ jobs: uses: actions/cache@v2.1.4 with: path: '${{ runner.workspace }}/boost/boost_*.tar.gz' - key: 'boost-${{ matrix.boost-version }}' + key: 'boost_${{ matrix.boost-version }}' - name: Clean up PATH uses: egor-tensin/cleanup-path@v2 diff --git a/.github/workflows/boost_toolsets.yml b/.github/workflows/boost_toolsets.yml index a58ef18..3fe12b3 100644 --- a/.github/workflows/boost_toolsets.yml +++ b/.github/workflows/boost_toolsets.yml @@ -113,7 +113,7 @@ jobs: uses: actions/cache@v2.1.4 with: path: '${{ runner.workspace }}/boost/boost_*.tar.gz' - key: 'boost-${{ matrix.boost-version }}' + key: 'boost_${{ matrix.boost-version }}' - name: Clean up PATH uses: egor-tensin/cleanup-path@v2 diff --git a/.github/workflows/ci_appveyor.yml b/.github/workflows/ci_appveyor.yml index 80248d0..26e2e16 100644 --- a/.github/workflows/ci_appveyor.yml +++ b/.github/workflows/ci_appveyor.yml @@ -47,8 +47,8 @@ jobs: - name: Cache Boost uses: actions/cache@v2.1.4 with: - path: C:\projects\boost_*.tar.gz - key: 'boost-${{ env.boost_version }}' + path: '${{ github.workspace }}/examples/build/boost_*.tar.gz' + key: 'boost_${{ env.BOOST_VERSION }}' - name: Build Boost run: python -m project.ci.boost --hint AppVeyor -- --with-filesystem diff --git a/.github/workflows/ci_github.yml b/.github/workflows/ci_github.yml index 4c4116e..c2907b9 100644 --- a/.github/workflows/ci_github.yml +++ b/.github/workflows/ci_github.yml @@ -46,8 +46,8 @@ jobs: - name: Cache Boost uses: actions/cache@v2.1.4 with: - path: '${{ runner.workspace }}/boost_*.tar.gz' - key: 'boost-${{ env.boost_version }}' + path: '${{ runner.workspace }}/build/boost_*.tar.gz' + key: 'boost_${{ env.BOOST_VERSION }}' - name: Build Boost run: python -m project.ci.boost -- --with-filesystem diff --git a/.github/workflows/ci_travis.yml b/.github/workflows/ci_travis.yml index 3dc1da5..dc1f370 100644 --- a/.github/workflows/ci_travis.yml +++ b/.github/workflows/ci_travis.yml @@ -45,8 +45,8 @@ jobs: - name: Cache Boost uses: actions/cache@v2.1.4 with: - path: '${{ env.HOME }}/boost_*.tar.gz' - key: 'boost-${{ env.boost_version }}' + path: '${{ github.workspace }}/examples/build/boost_*.tar.gz' + key: 'boost_${{ env.BOOST_VERSION }}' - name: Build Boost run: python -m project.ci.boost --hint Travis -- --with-filesystem -- cgit v1.2.3