Skip to content

Commit

Permalink
Auto merge of rust-lang#137703 - Noratrieb:Noratrieb-patch-2, r=marco…
Browse files Browse the repository at this point in the history
…ieni

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
  • Loading branch information
bors committed Feb 27, 2025
2 parents 96cfc75 + 64ae382 commit 08367fd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 08367fd

Please sign in to comment.