add scope

rust-lang · May 24, 2024 · 1908bf7 · 1908bf7
1 parent 33ff7ee
commit 1908bf7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -124,6 +124,10 @@ jobs:
         NO_STD: ${{ matrix.no_std }}
         TEST_VERBATIM: ${{ matrix.test_verbatim }}
 
+    # Configure buildx to use Docker layer caching
+    - uses: docker/setup-buildx-action@v3
+      if: matrix.os == 'ubuntu-latest'
+
     # Otherwise we use our docker containers to run builds
     - run: cargo generate-lockfile && ./ci/run-docker.sh ${{ matrix.target }}
       if: matrix.os == 'ubuntu-latest'

diff --git a/ci/run-docker.sh b/ci/run-docker.sh
@@ -43,11 +43,15 @@ run() {
 
     if [ "$GITHUB_ACTIONS" = "true" ]; then
       # Enable Docker image caching
+      if [ -n "$TARGET" ]; then
+        extra_cache_args=",scope=$TARGET"
+      fi
+
       buildx="buildx"
       build_args=(
         "${build_args[@]:-}"
-        "--cache-to" "type=gha"
-        "--cache-from" "type=gha"
+        "--cache-to" "type=gha${extra_cache_args:-}"
+        "--cache-from" "type=gha${extra_cache_args:-}"
       )
     fi