Auto merge of #116450 - Kobzol:automation-try-bors-ci, r=Mark-Simulacrum
Enable new bors try branch to run on CI Needed to fix [this error](https://github.com/rust-lang/rust/actions/runs/6420044833/job/17431256956). Inspired by https://github.com/rust-lang/rust/pull/99988 Also, removes `try-merge` from the workflow. It shouldn't have been added in https://github.com/rust-lang/rust/pull/116353. r? `@Mark-Simulacrum`
This commit is contained in:
commit
fdf32ee9fc
4 changed files with 3 additions and 4 deletions
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
|
@ -22,7 +22,6 @@ name: CI
|
||||||
- try
|
- try
|
||||||
- try-perf
|
- try-perf
|
||||||
- automation/bors/try
|
- automation/bors/try
|
||||||
- automation/bors/try-merge
|
|
||||||
- master
|
- master
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
|
|
|
@ -282,7 +282,6 @@ on:
|
||||||
- try
|
- try
|
||||||
- try-perf
|
- try-perf
|
||||||
- automation/bors/try
|
- automation/bors/try
|
||||||
- automation/bors/try-merge
|
|
||||||
- master
|
- master
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
|
|
|
@ -47,7 +47,8 @@ source "$ci_dir/shared.sh"
|
||||||
|
|
||||||
export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
|
export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
|
||||||
|
|
||||||
if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf; then
|
if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \
|
||||||
|
isCiBranch automation/bors/try; 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"
|
||||||
HAS_METRICS=1
|
HAS_METRICS=1
|
||||||
|
|
|
@ -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 || isCiBranch try-perf; then
|
if isCiBranch auto || isCiBranch try || isCiBranch try-perf || isCiBranch automation/bors/try; then
|
||||||
echo "channel verification is only executed on PR builds"
|
echo "channel verification is only executed on PR builds"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue