ci: Fix setup of ccache in twister workflow

Path for cache directory has changed, adapt workflow accordingly. Signed-off-by: Anas Nashif <[email protected]>
zephyrproject-rtos · Jun 6, 2023 · 1ebf0fd · 1ebf0fd
1 parent 97935bb
commit 1ebf0fd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml
@@ -86,15 +86,15 @@ jobs:
         uses: zephyrproject-rtos/[email protected]
         with:
           key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-clang-${{ matrix.platform }}-ccache
-          path: /github/home/.ccache
+          path: /github/home/.cache/ccache
           aws-s3-bucket: ccache.zephyrproject.org
           aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
 
       - name: ccache stats initial
         run: |
-          test -d github/home/.ccache && rm -rf /github/home/.ccache && mv github/home/.ccache /github/home/.ccache
+          test -d github/home/.cache/ccache && rm -rf /github/home/.cache/ccache && mv github/home/.cache/ccache /github/home/.cache/ccache
           ccache -M 10G -s
 
       - name: Run Tests with Twister
@@ -119,6 +119,7 @@ jobs:
       - name: ccache stats post
         run: |
           ccache -s
+          ccache -p
 
       - name: Upload Unit Test Results
         if: always() && steps.twister.outputs.report_needed != 0

diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -70,15 +70,15 @@ jobs:
         uses: zephyrproject-rtos/[email protected]
         with:
           key: ${{ steps.ccache_cache_prop.outputs.repo }}-${{github.event_name}}-${{matrix.platform}}-codecov-ccache
-          path: /github/home/.ccache
+          path: /github/home/.cache/ccache
           aws-s3-bucket: ccache.zephyrproject.org
           aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
 
       - name: ccache stats initial
         run: |
-          test -d github/home/.ccache && mv github/home/.ccache /github/home/.ccache
+          test -d github/home/.cache/ccache && mv github/home/.cache/ccache /github/home/.cache/ccache
           ccache -M 10G -s
 
       - name: Run Tests with Twister (Push)
@@ -100,6 +100,7 @@ jobs:
       - name: ccache stats post
         run: |
           ccache -s
+          ccache -p
 
       - name: Upload Coverage Results
         if: always()

diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml
@@ -200,15 +200,15 @@ jobs:
         continue-on-error: true
         with:
           key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-${{github.event_name}}-${{ matrix.subset }}-ccache
-          path: /github/home/.ccache
+          path: /github/home/.cache/ccache
           aws-s3-bucket: ccache.zephyrproject.org
           aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
 
       - name: ccache stats initial
         run: |
-          test -d github/home/.ccache && rm -rf /github/home/.ccache && mv github/home/.ccache /github/home/.ccache
+          test -d github/home/.cache/ccache && rm -rf /github/home/.cache/ccache && mv github/home/.cache/ccache /github/home/.cache/ccache
           ccache -M 10G -s
 
       - if: github.event_name == 'push'
@@ -254,6 +254,7 @@ jobs:
 
       - name: ccache stats post
         run: |
+          ccache -p
           ccache -s
 
       - name: Upload Unit Test Results