Revert: Use workaround for Github Actions Docker cache

dolfinus · dolfinus · commit 05e605eb633b · 2026-01-12T11:44:21.000+03:00
diff --git a/.github/workflows/clickhouse-tests.yml b/.github/workflows/clickhouse-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,8 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
+          cache-to: type=gha,scope=test,mode=max
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/ftp-tests.yml b/.github/workflows/ftp-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/ftps-tests.yml b/.github/workflows/ftps-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/hdfs-tests.yml b/.github/workflows/hdfs-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/hive-tests.yml b/.github/workflows/hive-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/iceberg-tests.yml b/.github/workflows/iceberg-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/mssql-tests.yml b/.github/workflows/mssql-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/mysql-tests.yml b/.github/workflows/mysql-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/oracle-tests.yml b/.github/workflows/oracle-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/s3-tests.yml b/.github/workflows/s3-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           file: docker/Dockerfile.worker
           target: test
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/samba-tests.yml b/.github/workflows/samba-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/scheduler-tests.yml b/.github/workflows/scheduler-tests.yml
@@ -25,15 +25,6 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache/restore@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-worker-${{ hashFiles('docker/Dockerfile.worker', 'pyproject.toml', 'uv.lock', 'docker/download_ivy2_packages.py', 'syncmaster/worker/ivy2.py') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-worker-
-
       - name: Build Worker Image
         uses: docker/build-push-action@v6
         with:
@@ -42,7 +33,7 @@ jobs:
           target: test
           file: docker/Dockerfile.worker
           load: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
+          cache-from: type=gha,scope=test
 
       - name: Start worker
         run: |
diff --git a/.github/workflows/scheduler_docker_image.yml b/.github/workflows/scheduler_docker_image.yml
@@ -73,15 +73,6 @@ jobs:
             echo "PLATFORMS=linux/amd64,linux/arm64/v8" >> $GITHUB_ENV
           fi
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-scheduler-${{ hashFiles('docker/Dockerfile.scheduler', 'pyproject.toml', 'uv.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-scheduler-
-
       - name: Build scheduler image
         uses: docker/build-push-action@v6
         with:
@@ -92,20 +83,12 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           pull: true
           push: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
-          cache-to: type=local,dest=${{ runner.temp }}/.buildx-cache-new,mode=max,compression=zstd,compression-level=3
+          cache-from: type=gha,scope=scheduler
+          cache-to: type=gha,scope=scheduler,mode=max
           platforms: ${{ env.PLATFORMS }}
           provenance: mode=max
           sbom: true
 
-        # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-      - name: Move cache
-        run: |
-          rm -rf ${{ runner.temp }}/.buildx-cache
-          mv ${{ runner.temp }}/.buildx-cache-new ${{ runner.temp }}/.buildx-cache
-
       - name: Convert README to Markdown
         uses: docker://pandoc/core:2.9
         with:
diff --git a/.github/workflows/server_docker_image.yml b/.github/workflows/server_docker_image.yml
@@ -68,15 +68,6 @@ jobs:
             echo "PLATFORMS=linux/amd64,linux/arm64/v8" >> $GITHUB_ENV
           fi
 
-      # https://docs.docker.com/build/ci/github-actions/cache/#local-cache
-      - name: Cache Docker layers
-        uses: actions/cache@v5
-        with:
-          path: ${{ runner.temp }}/.buildx-cache
-          key: ${{ runner.os }}-buildx-server-${{ hashFiles('docker/Dockerfile.serer', 'pyproject.toml', 'uv.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-server-
-
       - name: Build Server image
         uses: docker/build-push-action@v6
         with:
@@ -87,20 +78,12 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           pull: true
           push: true
-          cache-from: type=local,src=${{ runner.temp }}/.buildx-cache
-          cache-to: type=local,dest=${{ runner.temp }}/.buildx-cache-new,mode=max,compression=zstd,compression-level=3
+          cache-from: type=gha,scope=server
+          cache-to: type=gha,scope=server,mode=max
           platforms: ${{ env.PLATFORMS }}
           provenance: mode=max
           sbom: true
 
-        # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-      - name: Move cache
-        run: |
-          rm -rf ${{ runner.temp }}/.buildx-cache
-          mv ${{ runner.temp }}/.buildx-cache-new ${{ runner.temp }}/.buildx-cache
-
       - name: Convert README to Markdown
         uses: docker://pandoc/core:2.9
         with:
diff --git a/.github/workflows/sftp-tests.yml b/.github/workflows/sftp-tests.yml
diff --git a/.github/workflows/webdav-tests.yml b/.github/workflows/webdav-tests.yml
diff --git a/.github/workflows/worker_docker_image.yml b/.github/workflows/worker_docker_image.yml
