From 8cf8f2693fc2b24f25854ed12eaaf7c88eda2a56 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Sun, 13 Oct 2024 23:29:24 +0200 Subject: [PATCH 1/2] CI: Return to custom cache action --- .github/workflows/build_and_test.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index e1cf59d..49ff4a9 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -36,22 +36,24 @@ jobs: # that comes from the checkout. See "prepare target_ws for cache" task below - name: cache target_ws if: ${{ ! matrix.env.CCOV }} - uses: actions/cache@v4 + uses: rhaschke/cache@main with: - save-always: true path: ${{ env.BASEDIR }}/target_ws key: target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}-${{ github.run_id }} restore-keys: | target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }} + env: + GHA_CACHE_SAVE: always - name: cache ccache - uses: actions/cache@v4 + uses: rhaschke/cache@main with: - save-always: true path: ${{ env.CCACHE_DIR }} key: ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }} restore-keys: | ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }} ccache-${{ env.CACHE_PREFIX }} + env: + GHA_CACHE_SAVE: always - name: industrial_ci uses: ros-industrial/industrial_ci@master env: ${{ matrix.env }} From c3445ffa23606a1f1435d1278f361c8a7c3817de Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Sun, 13 Oct 2024 23:57:02 +0200 Subject: [PATCH 2/2] CI: Fix pre-commit action --- .github/workflows/format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 52fc2fa..0faf391 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -16,4 +16,4 @@ jobs: - uses: actions/checkout@v4 - name: Install clang-format-14 run: sudo apt-get install clang-format-14 - - uses: pre-commit/action@v3.0.1 + - uses: rhaschke/pre-commit-action@main