diff options
| author | bors <bors@rust-lang.org> | 2023-10-08 01:48:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-08 01:48:31 +0000 |
| commit | fdf32ee9fcd259913c7dece8f7b915b2d5560a49 (patch) | |
| tree | ec6f7b5d1de43299ca23a68bc5b27eb72ed1ff72 | |
| parent | e9addfdecf14633324fc5c935f4f2983699bef7e (diff) | |
| parent | 098dd979393e596a4434f5b88492054452b6b814 (diff) | |
| download | rust-fdf32ee9fcd259913c7dece8f7b915b2d5560a49.tar.gz rust-fdf32ee9fcd259913c7dece8f7b915b2d5560a49.zip | |
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`
| -rw-r--r-- | .github/workflows/ci.yml | 1 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 1 | ||||
| -rwxr-xr-x | src/ci/run.sh | 3 | ||||
| -rwxr-xr-x | src/ci/scripts/verify-channel.sh | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e599829097..8c207e7ea11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,6 @@ name: CI - try - try-perf - automation/bors/try - - automation/bors/try-merge - master pull_request: branches: diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 838c72612d6..93b07350ac1 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -282,7 +282,6 @@ on: - try - try-perf - automation/bors/try - - automation/bors/try-merge - master pull_request: branches: diff --git a/src/ci/run.sh b/src/ci/run.sh index 98f2cdac5dc..abeff7b837d 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -47,7 +47,8 @@ source "$ci_dir/shared.sh" 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.metrics" HAS_METRICS=1 diff --git a/src/ci/scripts/verify-channel.sh b/src/ci/scripts/verify-channel.sh index cd28748a44b..edeea20144b 100755 --- a/src/ci/scripts/verify-channel.sh +++ b/src/ci/scripts/verify-channel.sh @@ -8,7 +8,7 @@ IFS=$'\n\t' 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" exit fi |