From d96efb8346c3c250538f5bc9a0d3d84ce9855f91 Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Sat, 23 Mar 2024 19:19:38 +0100 Subject: [PATCH] Revert "Use rustc from stage0 instead of stage0-sysroot" (rust-lang/backtrace#603) This reverts commit c31ea5ba7ac52f5c15c65cfec7d7b5d0bcf00eed (rust-lang/backtrace#602). Don't do that, we need to use stage0-sysroot, bootstrap is just buggy. --- .github/actions/build-with-patched-std/action.yml | 2 +- .github/workflows/check-binary-size.yml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/build-with-patched-std/action.yml b/.github/actions/build-with-patched-std/action.yml index bdd127a38..5466a2289 100644 --- a/.github/actions/build-with-patched-std/action.yml +++ b/.github/actions/build-with-patched-std/action.yml @@ -41,7 +41,7 @@ runs: python3 x.py build library --stage 0 TEMP_BUILD_OUTPUT=$(mktemp test-binary-XXXXXXXX) - "$RUSTC_BUILD_DIR/stage0/bin/rustc" $RUSTC_FLAGS "${{ inputs.main-rs }}" -o "$TEMP_BUILD_OUTPUT" + "$RUSTC_BUILD_DIR/stage0-sysroot/bin/rustc" $RUSTC_FLAGS "${{ inputs.main-rs }}" -o "$TEMP_BUILD_OUTPUT" BINARY_SIZE=$(stat -c '%s' "$TEMP_BUILD_OUTPUT") rm "$TEMP_BUILD_OUTPUT" diff --git a/.github/workflows/check-binary-size.yml b/.github/workflows/check-binary-size.yml index d045fb7b3..5f4ec6168 100644 --- a/.github/workflows/check-binary-size.yml +++ b/.github/workflows/check-binary-size.yml @@ -6,8 +6,9 @@ name: Check binary size on: pull_request_target: - branches: - - master + # HACK(jubilee): something broke the distributed LLVM libso and I don't know what. + branches: [] +# - master # Both the "measure" and "report" jobs need to know this. env: