ci: Clean up workflow file and docker script

2 files changed, 12 insertions, 12 deletions

diff --git a/library/compiler-builtins/.github/workflows/main.yaml b/library/compiler-builtins/.github/workflows/main.yaml
index 2b57d7eb3aa..f7522a53d9d 100644
--- a/library/compiler-builtins/.github/workflows/main.yaml
+++ b/library/compiler-builtins/.github/workflows/main.yaml
@@ -131,6 +131,9 @@ jobs:
         path: /tmp/.buildx-cache
         key: ${{ matrix.target }}-buildx-${{ github.sha }}
         restore-keys: ${{ matrix.target }}-buildx-
+    # Configure buildx to use Docker layer caching
+    - uses: docker/setup-buildx-action@v3
+      if: matrix.os == 'ubuntu-24.04'
 
     - name: Cache compiler-rt
       id: cache-compiler-rt
@@ -155,14 +158,10 @@ jobs:
       shell: bash
       run: ./ci/run.sh ${{ matrix.target }}
 
-    # Configure buildx to use Docker layer caching
-    - uses: docker/setup-buildx-action@v3
-      if: matrix.os == 'ubuntu-24.04'
-
     # Otherwise we use our docker containers to run builds
     - name: Run in Docker
       if: matrix.os == 'ubuntu-24.04'
-      run: cargo generate-lockfile && ./ci/run-docker.sh ${{ matrix.target }}
+      run: ./ci/run-docker.sh ${{ matrix.target }}
 
     - name: Print test logs if available
       if: always()
@@ -193,7 +192,7 @@ jobs:
         rustup default nightly
         rustup component add clippy
     - uses: Swatinem/rust-cache@v2
-    - run: cargo clippy -- -D clippy::all
+    - run: cargo clippy --workspace --all-targets
 
   benchmarks:
     name: Benchmarks
diff --git a/library/compiler-builtins/ci/run-docker.sh b/library/compiler-builtins/ci/run-docker.sh
index 58838fadf3c..d0122dee5c8 100755
--- a/library/compiler-builtins/ci/run-docker.sh
+++ b/library/compiler-builtins/ci/run-docker.sh
@@ -7,6 +7,13 @@ set -euxo pipefail
 
 host_arch="$(uname -m | sed 's/arm64/aarch64/')"
 
+# Directories and files that do not yet exist need to be created before
+# calling docker, otherwise docker will create them but they will be owned
+# by root.
+mkdir -p target
+cargo generate-lockfile
+cargo generate-lockfile --manifest-path builtins-test-intrinsics/Cargo.toml
+
 run() {
     local target="$1"
 
@@ -19,12 +26,6 @@ run() {
         echo "target is emulated"
     fi
 
-    # Directories and files that do not yet exist need to be created before
-    # calling docker, otherwise docker will create them but they will be owned
-    # by root.
-    mkdir -p target
-    cargo generate-lockfile --manifest-path builtins-test-intrinsics/Cargo.toml
-
     run_cmd="HOME=/tmp"
 
     if [ "${GITHUB_ACTIONS:-}" = "true" ]; then