diff options
| author | bors <bors@rust-lang.org> | 2025-03-05 02:43:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-05 02:43:15 +0000 |
| commit | ac951d379913c667a1fb73a0830e81d65d2007cf (patch) | |
| tree | 0e95d4d9055ab7295908f998b9d5efb7890b4988 /.github/workflows | |
| parent | 08db600e8e276b548e986abe7239c2a85d2f425f (diff) | |
| parent | 7ba7cc835ec18876b8133c4f051abfd5bfebb0aa (diff) | |
| download | rust-ac951d379913c667a1fb73a0830e81d65d2007cf.tar.gz rust-ac951d379913c667a1fb73a0830e81d65d2007cf.zip | |
Auto merge of #138021 - workingjubilee:rollup-brhnycu, r=workingjubilee
Rollup of 6 pull requests Successful merges: - #137077 (Postprocess bootstrap metrics into GitHub job summary) - #137373 (Compile run-make-support and run-make tests with the bootstrap compiler) - #137634 (Update `compiler-builtins` to 0.1.149) - #137667 (Add `dist::Gcc` build step) - #137722 (`librustdoc`: 2024 edition! 🎊) - #137947 (Do not install rustup on Rust for Linux job) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ci.yml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cfbb4e77c4..a91598586b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,6 +182,13 @@ jobs: - name: show the current environment run: src/ci/scripts/dump-environment.sh + # Pre-build citool before the following step uninstalls rustup + # Build is into the build directory, to avoid modifying sources + - name: build citool + run: | + cd src/ci/citool + CARGO_TARGET_DIR=../../../build/citool cargo build + - name: run the build # Redirect stderr to stdout to avoid reordering the two streams in the GHA logs. run: src/ci/scripts/run-build-from-ci.sh 2>&1 @@ -218,6 +225,16 @@ jobs: # erroring about invalid credentials instead. if: github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1' + - name: postprocess metrics into the summary + run: | + if [ -f build/metrics.json ]; then + ./build/citool/debug/citool postprocess-metrics build/metrics.json ${GITHUB_STEP_SUMMARY} + elif [ -f obj/build/metrics.json ]; then + ./build/citool/debug/citool postprocess-metrics obj/build/metrics.json ${GITHUB_STEP_SUMMARY} + else + echo "No metrics.json found" + fi + - name: upload job metrics to DataDog if: needs.calculate_matrix.outputs.run_type != 'pr' env: |