use restore and skip again

Signed-off-by: Yutaka Kondo <[email protected]>
youtalk · Jul 3, 2024 · ce89ae8 · ce89ae8
1 parent 7cb2dde
commit ce89ae8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml
@@ -50,6 +50,7 @@ runs:
       with:
         cache-source: root-ccache
         cache-target: /root/.ccache
+        skip-extraction: ${{ steps.cache.outputs.cache-hit }}
 
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v3

diff --git a/.github/workflows/docker-build-and-push-main-self-hosted.yaml b/.github/workflows/docker-build-and-push-main-self-hosted.yaml
@@ -68,8 +68,8 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Cache
-        uses: actions/cache@v3
+      - name: Restore cache
+        uses: actions/cache/restore@v4
         id: cache
         with:
           path: |
@@ -87,6 +87,7 @@ jobs:
         with:
           cache-source: root-ccache
           cache-target: /root/.ccache
+          skip-extraction: true
 
       - name: Build 'Autoware'
         if: steps.author-check.outputs.author-found == 'true' || ${{ github.event_name == 'workflow_dispatch' }}

diff --git a/.github/workflows/docker-build-and-push-main.yaml b/.github/workflows/docker-build-and-push-main.yaml
@@ -68,9 +68,8 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Cache
-        uses: actions/cache@v3
-        id: cache
+      - name: Restore cache
+        uses: actions/cache/restore@v4
         with:
           path: |
             root-ccache
@@ -84,6 +83,7 @@ jobs:
         with:
           cache-source: root-ccache
           cache-target: /root/.ccache
+          skip-extraction: true
 
       - name: Build 'Autoware'
         if: steps.author-check.outputs.author-found == 'true' || ${{ github.event_name == 'workflow_dispatch' }}