Enable cache for Docker images

rust-lang · May 24, 2024 · e5cb826 · e5cb826
1 parent 1f7f7ee
commit e5cb826
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -108,6 +108,7 @@ jobs:
     - uses: Swatinem/rust-cache@v2
       with:
         key: ${{ matrix.target }}
+
     - name: Download compiler-rt reference sources
       run: |
         curl -L -o code.tar.gz https://github.com/rust-lang/llvm-project/archive/rustc/18.0-2024-02-13.tar.gz
@@ -123,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
@@ -41,7 +41,18 @@ run() {
       export RUST_COMPILER_RT_ROOT=./compiler-rt
     fi
 
-    docker build \
+    if [ "$GITHUB_ACTIONS" = "true" ]; then
+      # Enable Docker image caching on GHA
+
+      buildx="buildx"
+      build_args=(
+        "${build_args[@]:-}"
+        "--cache-to" "type=gha,scope=$target"
+        "--cache-from" "type=gha,scope=$target"
+      )
+    fi
+
+    docker "${buildx:-}" build \
            -t "builtins-$target" \
            ${build_args[@]:-} \
            "ci/docker/$target"