diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index fc94188..00e3721 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -16,7 +16,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install clang-format-14 run: sudo apt-get install clang-format-14 - - uses: pre-commit/action@v3.0.0 + - uses: pre-commit/action@v3.0.1 diff --git a/.github/workflows/industrial_ci_action.yaml b/.github/workflows/industrial_ci_action.yaml index 8e4691f..b039682 100644 --- a/.github/workflows/industrial_ci_action.yaml +++ b/.github/workflows/industrial_ci_action.yaml @@ -42,22 +42,24 @@ jobs: # that comes from the checkout. See "prepare target_ws for cache" task below - name: cache target_ws if: ${{ ! matrix.env.CCOV }} - uses: pat-s/always-upload-cache@v3 + uses: actions/cache@v4 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') }} - name: cache ccache - uses: pat-s/always-upload-cache@v3 + uses: actions/cache@v4 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 }} - name: industrial_ci - uses: 'ros-industrial/industrial_ci@master' + uses: ros-industrial/industrial_ci@master env: ${{ matrix.env }} - name: upload test artifacts (on failure) uses: actions/upload-artifact@v4 @@ -66,7 +68,7 @@ jobs: name: test-results path: ${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml - name: upload codecov report - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 if: ${{ matrix.env.CCOV }} with: files: ${{ env.BASEDIR }}/coverage.info