dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #99988 - rylev:allow-try-perf, r=Mark-Simulacrum 

Allow try-perf branch to run in CI

We want to be able to build artifacts through the try-perf branch but without this change the CI fails early.

r? `@Mark-Simulacrum`
This commit is contained in:
bors 2022-07-31 18:59:10 +00:00
parent 3405e402fa 0942efdb66
commit f9cba63746
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ci/run.sh
View File

@ -43,7 +43,7 @@ else
PYTHON="python2" PYTHON="python2"
fi fi
if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try; then if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.metrics" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.metrics"
fi fi

2
src/ci/scripts/verify-channel.sh
View File

@ -8,7 +8,7 @@ IFS=$'\n\t'
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
if isCiBranch auto || isCiBranch try; then if isCiBranch auto || isCiBranch try || isCiBranch try-perf; then
echo "channel verification is only executed on PR builds" echo "channel verification is only executed on PR builds"
exit exit
fi fi