Skip to content

Commit 08367fd

Browse files
committed
Auto merge of #137703 - Noratrieb:Noratrieb-patch-2, r=marcoieni
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
2 parents 96cfc75 + 64ae382 commit 08367fd

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/ci/github-actions/jobs.yml

+3
Original file line numberDiff line numberDiff line change
@@ -474,12 +474,14 @@ auto:
474474
env:
475475
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
476476
SCRIPT: make ci-msvc-py
477+
DISABLE_SCCACHE: 1
477478
<<: *job-windows
478479

479480
- name: i686-msvc-2
480481
env:
481482
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
482483
SCRIPT: make ci-msvc-ps1
484+
DISABLE_SCCACHE: 1
483485
<<: *job-windows
484486

485487
# x86_64-msvc-ext is split into multiple jobs to run tests in parallel.
@@ -594,6 +596,7 @@ auto:
594596
--enable-profiler
595597
SCRIPT: python x.py dist bootstrap --include-default-paths
596598
DIST_REQUIRE_ALL_TOOLS: 1
599+
DISABLE_SCCACHE: 1
597600
CODEGEN_BACKENDS: llvm,cranelift
598601
<<: *job-windows
599602

src/ci/run.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch
6262
fi
6363

6464
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-verbose-configure"
65-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache"
65+
if [ -n $DISABLE_SCCACHE ]; then
66+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache"
67+
fi
6668
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules"
6769
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-locked-deps"
6870
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-cargo-native-static"

0 commit comments

Comments
 (0)