From 8494993d3d1ad99e35c6a4e82ec133e9018bc384 Mon Sep 17 00:00:00 2001 From: gavanderhoorn Date: Thu, 21 Jan 2021 14:40:41 +0100 Subject: [PATCH] ci: fix caching. Due to the incorrect path passed to the 'actions/cache' step, industrial_ci was unable to find the ccache cache, leading to it running essentially without ccache enabled (as it had no cache to reuse). --- .github/workflows/ci_bionic.yml | 6 +++--- .github/workflows/ci_focal.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_bionic.yml b/.github/workflows/ci_bionic.yml index 6c2dafd..e7b33da 100644 --- a/.github/workflows/ci_bionic.yml +++ b/.github/workflows/ci_bionic.yml @@ -37,10 +37,10 @@ jobs: - name: ccache cache files uses: actions/cache@v2 with: - path: ${{ env.CI_NAME }}/.ccache - key: ${{ env.CI_NAME }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} + path: ${{ env.OS_CODE_NAME }}/.ccache + key: ${{ env.OS_CODE_NAME }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} restore-keys: | - ${{ env.CI_NAME }}-ccache- + ${{ env.OS_CODE_NAME }}-ccache- - uses: 'ros-industrial/industrial_ci@master' env: ${{matrix.env}} diff --git a/.github/workflows/ci_focal.yml b/.github/workflows/ci_focal.yml index fba0753..0aff6fa 100644 --- a/.github/workflows/ci_focal.yml +++ b/.github/workflows/ci_focal.yml @@ -37,10 +37,10 @@ jobs: - name: ccache cache files uses: actions/cache@v2 with: - path: ${{ env.CI_NAME }}/.ccache - key: ${{ env.CI_NAME }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} + path: ${{ env.OS_CODE_NAME }}/.ccache + key: ${{ env.OS_CODE_NAME }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} restore-keys: | - ${{ env.CI_NAME }}-ccache- + ${{ env.OS_CODE_NAME }}-ccache- - uses: 'ros-industrial/industrial_ci@master' env: ${{matrix.env}}