downgrade buildkit-cache-dance

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

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml
@@ -46,13 +46,10 @@ runs:
           cache-${{ inputs.platform }}-
 
     - name: Inject cache into docker
-      uses: reproducible-containers/buildkit-cache-dance@v3.1.0
+      uses: reproducible-containers/buildkit-cache-dance@v2.1.4
       with:
-        cache-map: |
-          {
-            "root-ccache": "/root/.ccache"
-          }
-        skip-extraction: ${{ steps.cache.outputs.cache-hit }}
+        cache-source: root-ccache
+        cache-target: /root/.ccache
 
     - 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,9 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Restore cache
-        uses: actions/cache/restore@v4
+      - name: Cache
+        uses: actions/cache@v3
+        id: cache
         with:
           path: |
             root-ccache
@@ -78,14 +79,14 @@ jobs:
             cache-${{ matrix.platform }}-${{ matrix.name }}-
             cache-${{ matrix.platform }}-
 
+      - name: Restore cache
+        uses: actions/cache/restore@v4
+
       - name: Inject cache into docker
-        uses: reproducible-containers/buildkit-cache-dance@v3.1.2
+        uses: reproducible-containers/buildkit-cache-dance@v2.1.4
         with:
-          cache-map: |
-            {
-              "root-ccache": "/root/.ccache"
-            }
-          skip-extraction: true
+          cache-source: root-ccache
+          cache-target: /root/.ccache
 
       - 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,8 +68,9 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Restore cache
-        uses: actions/cache/restore@v4
+      - name: Cache
+        uses: actions/cache@v3
+        id: cache
         with:
           path: |
             root-ccache
@@ -79,13 +80,10 @@ jobs:
             cache-${{ matrix.platform }}-
 
       - name: Inject cache into docker
-        uses: reproducible-containers/buildkit-cache-dance@v3.1.2
+        uses: reproducible-containers/buildkit-cache-dance@v2.1.4
         with:
-          cache-map: |
-            {
-              "root-ccache": "/root/.ccache"
-            }
-          skip-extraction: true
+          cache-source: root-ccache
+          cache-target: /root/.ccache
 
       - name: Build 'Autoware'
         if: steps.author-check.outputs.author-found == 'true' || ${{ github.event_name == 'workflow_dispatch' }}