Skip to content

Commit dade97a

Browse files
committed
ci: Fix the binary size workflow
From the bootstrap error: thread 'main' panicked at src/bootstrap/src/core/config/config.rs:3283:21: `llvm.download-ci-llvm` cannot be set to `true` on CI. Use `if-unchanged` instead. So do that. Additionally pin rustc to hopefully prevent similar regressions in the future. Some settings to increase log output were also applied.
1 parent 9d2c34e commit dade97a

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/actions/build-with-patched-std/action.yml

+2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ runs:
3131
# symlink on Linux and a junction on Windows, so it will exist on both
3232
# platforms.
3333
RUSTC_BUILD_DIR: build/host
34+
RUST_BACKTRACE: 1
3435
working-directory: ${{ inputs.rustc-dir }}
3536
run: |
37+
set -x
3638
rm -rf "$RUSTC_BUILD_DIR/stage0-std"
3739
3840
(cd library/backtrace && git checkout ${{ inputs.backtrace-commit }})

.github/workflows/check-binary-size.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
# Both the "measure" and "report" jobs need to know this.
1414
env:
1515
SIZE_DATA_DIR: sizes
16+
RUST_BACKTRACE: 1
1617

1718
# Responsibility is divided between two jobs "measure" and "report", so that the
1819
# job that builds (and potentnially runs) untrusted code does not have PR write
@@ -55,17 +56,20 @@ jobs:
5556
with:
5657
repository: rust-lang/rust
5758
path: ${{ env.RUSTC_DIR }}
59+
# Arbitrary version from 2024-04-28
60+
ref: cc74ed08d53fbb440b4ab70035a92d89d418d23c
5861
- name: Set up std repository and backtrace submodule for size test
5962
shell: bash
6063
working-directory: ${{ env.RUSTC_DIR }}
6164
env:
6265
PR_SOURCE_REPO: ${{ github.event.pull_request.head.repo.full_name }}
6366
run: |
67+
set -x
6468
# Bootstrap config
65-
cat <<EOF > config.toml
69+
cat <<EOF > bootstrap.toml
6670
change-id = 9999999
6771
[llvm]
68-
download-ci-llvm = true
72+
download-ci-llvm = "if-unchanged"
6973
[rust]
7074
incremental = false
7175
EOF

0 commit comments

Comments
 (0)