From f4fb48f4b925c4c40df731634c8c8ae0442fccfd Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Wed, 22 Jun 2022 10:24:16 +0200 Subject: [PATCH] workflows: try to fix caching issue --- .github/workflows/main.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e79f719a4e..cba93b7e4c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: id: cache with: path: ./build/third_party/install - key: ${{ github.job }}-${{ hashFiles('./third_party/**') }} + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=$(pwd)/build/third_party/install" >> $GITHUB_ENV @@ -86,7 +86,7 @@ jobs: id: cache with: path: ./build/release/third_party/install - key: ${{ github.job }}-${{ hashFiles('./third_party/**') }} + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=$(pwd)/build/release/third_party/install" >> $GITHUB_ENV @@ -124,7 +124,7 @@ jobs: id: cache with: path: ~/.hunter - key: ${{ github.job }}-${{ hashFiles('~/.hunter/**') }} + key: ${{ github.job.name }}-${{ hashFiles('~/.hunter/**') }} - name: install pymavlink dependencies run: sudo apt-get update && sudo apt-get install -y python3-future - name: prepare mavlink headers because this is without superbuild @@ -158,7 +158,7 @@ jobs: id: cache with: path: ./build/default/third_party/install - key: ${{ github.job }}-${{ hashFiles('./third_party/**') }} + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=$(pwd)/build/default/third_party/install" >> $GITHUB_ENV @@ -300,7 +300,7 @@ jobs: id: cache with: path: ./build/linux-${{ matrix.arch_name }}/third_party/install - key: ${{ github.job }}-linux-${{ matrix.arch_name }}-${{ hashFiles('./third_party/**') }}-4 + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=/work/build/linux-${{ matrix.arch_name }}/third_party/install" >> $GITHUB_ENV @@ -332,7 +332,7 @@ jobs: id: cache with: path: ./build/manylinux2010-x64/third_party/install - key: ${{ github.job }}-${{ hashFiles('./third_party/**') }} + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=/work/build/manylinux2010-x64/third_party/install" >> $GITHUB_ENV @@ -370,7 +370,7 @@ jobs: id: cache with: path: ./build/release/third_party/install - key: ${{ github.job }}-${{ hashFiles('./third_party/**') }} + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=$(pwd)/build/release/third_party/install" >> $GITHUB_ENV @@ -420,7 +420,7 @@ jobs: id: cache with: path: ./build/${{ matrix.arch_name }}/third_party/install - key: ${{ github.job }}-${{ matrix.arch_name }}-${{ hashFiles('./third_party/**') }} + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=/work/build/${{ matrix.arch_name }}/third_party/install" >> $GITHUB_ENV @@ -466,7 +466,7 @@ jobs: id: cache with: path: ./build/${{ matrix.name }}/third_party/install - key: ${{ github.job }}-${{ matrix.name }}-${{ hashFiles('./third_party/**') }} + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=/work/build/${{ matrix.name }}/third_party/install" >> $GITHUB_ENV @@ -504,7 +504,7 @@ jobs: id: cache with: path: ./build/macos/third_party/install - key: ${{ github.job }}-${{ matrix.name }}-${{ hashFiles('./third_party/**') }} + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: fetch git tags for version run: git fetch --prune --unshallow --tags - name: disable superbuild on cache hit @@ -561,7 +561,7 @@ jobs: id: cache with: path: ./build/${{ matrix.name }}/third_party/install - key: ${{ github.job }}-${{ matrix.name }}-${{ hashFiles('./third_party/**', './tools/ios.toolchain.cmake') }} + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**', './tools/ios.toolchain.cmake') }} - name: fetch git tags for version run: git fetch --prune --unshallow --tags - name: disable superbuild on cache hit @@ -639,7 +639,7 @@ jobs: id: cache with: path: ./build/release/third_party/install - key: ${{ github.job }}-${{ hashFiles('./third_party/**') }}-2 + key: ${{ github.job.name }}-${{ hashFiles('./third_party/**') }} - name: disable superbuild on cache hit if: steps.cache.outputs.cache-hit == 'true' run: |