Auto merge of #137703 - Noratrieb:Noratrieb-patch-2, r=marcoieni

bors · bors · commit 08367fd383d6 · 2025-02-27T10:39:21.000Z
Try disabling sccache for i686-msvc https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/spurious.20.28.3F.29.20i686.20msvc.20errors try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: dist-i686-msvc
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
@@ -474,12 +474,14 @@ auto:
     env:
       RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc  --enable-sanitizers
       SCRIPT: make ci-msvc-py
+      DISABLE_SCCACHE: 1
     <<: *job-windows
 
   - name: i686-msvc-2
     env:
       RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
       SCRIPT: make ci-msvc-ps1
+      DISABLE_SCCACHE: 1
     <<: *job-windows
 
   # x86_64-msvc-ext is split into multiple jobs to run tests in parallel.
@@ -594,6 +596,7 @@ auto:
         --enable-profiler
       SCRIPT: python x.py dist bootstrap --include-default-paths
       DIST_REQUIRE_ALL_TOOLS: 1
+      DISABLE_SCCACHE: 1
       CODEGEN_BACKENDS: llvm,cranelift
     <<: *job-windows
 
diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -62,7 +62,9 @@ if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch
 fi
 
 RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-verbose-configure"
-RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache"
+if [ -n $DISABLE_SCCACHE ]; then
+  RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache"
+fi
 RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules"
 RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps"
 RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-native-static"
