From 6cf2fb890cc5b85cc72768f21b898fdec7a5e25e Mon Sep 17 00:00:00 2001 From: nora <48135649+Noratrieb@users.noreply.github.com> Date: Thu, 27 Feb 2025 07:59:27 +0100 Subject: [PATCH 1/3] disable sccache --- src/ci/run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index 536754f12bc6d..42dc1440427a3 100755 --- 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 ]; + 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" From c96ac724b68637ce1ca3197a4a50734772b0424f Mon Sep 17 00:00:00 2001 From: nora <48135649+Noratrieb@users.noreply.github.com> Date: Thu, 27 Feb 2025 08:01:26 +0100 Subject: [PATCH 2/3] disable sccache for i686-msvc --- src/ci/github-actions/jobs.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 64e64867de26f..1c482556dd8a3 100644 --- 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 From 64ae38291269caa8176e95e07b0fee1e7236cf36 Mon Sep 17 00:00:00 2001 From: nora <48135649+Noratrieb@users.noreply.github.com> Date: Thu, 27 Feb 2025 08:02:26 +0100 Subject: [PATCH 3/3] bash --- src/ci/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index 42dc1440427a3..415200e0a9dc4 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -62,7 +62,7 @@ if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch fi RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-verbose-configure" -if [ -n $DISABLE_SCCACHE ]; +if [ -n $DISABLE_SCCACHE ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-sccache" fi RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-manage-submodules"