Skip to content

Commit 2ca13d4

Browse files
JonathanBrouwerJonathanBrouwer
authored
Rollup merge of rust-lang#150771 - remove-homu-branches, r=marcoieni
Remove legacy homu `try` and `auto` branch mentions ~~To be merged once we get rid of homu.~~ I think that we can merge this now.
2 parents 29ef5b0 + c263d36 commit 2ca13d4

File tree

4 files changed

+15
-19
lines changed

4 files changed

+15
-19
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ name: CI
1111
on:
1212
push:
1313
branches:
14-
- auto
15-
- try
16-
- try-perf
17-
- automation/bors/try
1814
- automation/bors/auto
15+
- automation/bors/try
16+
- try-perf
1917
pull_request:
2018
branches:
2119
- "**"
@@ -33,9 +31,10 @@ defaults:
3331

3432
concurrency:
3533
# For a given workflow, if we push to the same branch, cancel all previous builds on that branch.
36-
# We add an exception for try builds (try branch) and unrolled rollup builds (try-perf), which
37-
# are all triggered on the same branch, but which should be able to run concurrently.
38-
group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try') && github.sha) || github.ref }}
34+
# We add an exception for try builds (automation/bors/try branch) and unrolled rollup builds
35+
# (try-perf), which are all triggered on the same branch, but which should be able to run
36+
# concurrently.
37+
group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try') && github.sha) || github.ref }}
3938
cancel-in-progress: true
4039
env:
4140
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
@@ -57,7 +56,7 @@ jobs:
5756
- name: Test citool
5857
# Only test citool on the auto branch, to reduce latency of the calculate matrix job
5958
# on PR/try builds.
60-
if: ${{ github.ref == 'refs/heads/auto' || github.ref == 'refs/heads/automation/bors/auto' }}
59+
if: ${{ github.ref == 'refs/heads/automation/bors/auto' }}
6160
run: |
6261
cd src/ci/citool
6362
CARGO_INCREMENTAL=0 cargo test
@@ -80,7 +79,7 @@ jobs:
8079
# access the environment.
8180
#
8281
# We only enable the environment for the rust-lang/rust repository, so that CI works on forks.
83-
environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto' || github.ref == 'refs/heads/automation/bors/auto')) && 'bors') || '' }}
82+
environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/automation/bors/auto')) && 'bors') || '' }}
8483
env:
8584
CI_JOB_NAME: ${{ matrix.name }}
8685
CI_JOB_DOC_URL: ${{ matrix.doc_url }}
@@ -314,7 +313,7 @@ jobs:
314313
needs: [ calculate_matrix, job ]
315314
# !cancelled() executes the job regardless of whether the previous jobs passed or failed
316315
if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}
317-
environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto' || github.ref == 'refs/heads/automation/bors/auto')) && 'bors') || '' }}
316+
environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/automation/bors/auto')) && 'bors') || '' }}
318317
steps:
319318
- name: checkout the source code
320319
uses: actions/checkout@v5

‎src/ci/citool/src/main.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,12 @@ impl GitHubContext {
4141
match (self.event_name.as_str(), self.branch_ref.as_str()) {
4242
("pull_request", _) => Some(RunType::PullRequest),
4343
("push", "refs/heads/try-perf") => Some(RunType::TryJob { job_patterns: None }),
44-
("push", "refs/heads/try" | "refs/heads/automation/bors/try") => {
44+
("push", "refs/heads/automation/bors/try") => {
4545
let patterns = self.get_try_job_patterns();
4646
let patterns = if !patterns.is_empty() { Some(patterns) } else { None };
4747
Some(RunType::TryJob { job_patterns: patterns })
4848
}
49-
("push", "refs/heads/auto" | "refs/heads/automation/bors/auto") => {
50-
Some(RunType::AutoJob)
51-
}
49+
("push", "refs/heads/automation/bors/auto") => Some(RunType::AutoJob),
5250
("push", "refs/heads/main") => Some(RunType::MainJob),
5351
_ => None,
5452
}

‎src/ci/citool/tests/jobs.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const TEST_JOBS_YML_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/tes
44

55
#[test]
66
fn auto_jobs() {
7-
let stdout = get_matrix("push", "commit", "refs/heads/auto");
7+
let stdout = get_matrix("push", "commit", "refs/heads/automation/bors/auto");
88
insta::assert_snapshot!(stdout, @r#"
99
jobs=[{"name":"aarch64-gnu","full_name":"auto - aarch64-gnu","os":"ubuntu-22.04-arm","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"free_disk":true},{"name":"x86_64-gnu-llvm-18-1","full_name":"auto - x86_64-gnu-llvm-18-1","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","DOCKER_SCRIPT":"stage_2_test_set1.sh","IMAGE":"x86_64-gnu-llvm-18","READ_ONLY_SRC":"0","RUST_BACKTRACE":1,"TOOLSTATE_PUBLISH":1},"free_disk":true},{"name":"aarch64-apple","full_name":"auto - aarch64-apple","os":"macos-14","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","MACOSX_DEPLOYMENT_TARGET":11.0,"MACOSX_STD_DEPLOYMENT_TARGET":11.0,"NO_DEBUG_ASSERTIONS":1,"NO_LLVM_ASSERTIONS":1,"NO_OVERFLOW_CHECKS":1,"RUSTC_RETRY_LINKER_ON_SEGFAULT":1,"RUST_CONFIGURE_ARGS":"--enable-sanitizers --enable-profiler --set rust.jemalloc","SCRIPT":"./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin","SELECT_XCODE":"/Applications/Xcode_15.4.app","TOOLSTATE_PUBLISH":1,"USE_XCODE_CLANG":1}},{"name":"dist-i686-msvc","full_name":"auto - dist-i686-msvc","os":"windows-2022","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","CODEGEN_BACKENDS":"llvm,cranelift","DEPLOY_BUCKET":"rust-lang-ci2","DIST_REQUIRE_ALL_TOOLS":1,"RUST_CONFIGURE_ARGS":"--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler","SCRIPT":"python x.py dist bootstrap --include-default-paths","TOOLSTATE_PUBLISH":1}},{"name":"pr-check-1","full_name":"auto - pr-check-1","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"continue_on_error":false,"free_disk":true},{"name":"pr-check-2","full_name":"auto - pr-check-2","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"continue_on_error":false,"free_disk":true},{"name":"tidy","full_name":"auto - tidy","os":"ubuntu-24.04","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"continue_on_error":false,"free_disk":true,"doc_url":"https://foo.bar"}]
1010
run_type=auto
@@ -13,7 +13,7 @@ fn auto_jobs() {
1313

1414
#[test]
1515
fn try_jobs() {
16-
let stdout = get_matrix("push", "commit", "refs/heads/try");
16+
let stdout = get_matrix("push", "commit", "refs/heads/automation/bors/try");
1717
insta::assert_snapshot!(stdout, @r###"
1818
jobs=[{"name":"dist-x86_64-linux","full_name":"try - dist-x86_64-linux","os":"ubuntu-22.04-16core-64gb","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","CODEGEN_BACKENDS":"llvm,cranelift","DEPLOY_BUCKET":"rust-lang-ci2","DIST_TRY_BUILD":1,"TOOLSTATE_PUBLISH":1}}]
1919
run_type=try
@@ -28,7 +28,7 @@ fn try_custom_jobs() {
2828
2929
try-job: aarch64-gnu
3030
try-job: dist-i686-msvc"#,
31-
"refs/heads/try",
31+
"refs/heads/automation/bors/try",
3232
);
3333
insta::assert_snapshot!(stdout, @r###"
3434
jobs=[{"name":"aarch64-gnu","full_name":"try - aarch64-gnu","os":"ubuntu-22.04-arm","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","DEPLOY_BUCKET":"rust-lang-ci2","TOOLSTATE_PUBLISH":1},"free_disk":true},{"name":"dist-i686-msvc","full_name":"try - dist-i686-msvc","os":"windows-2022","env":{"ARTIFACTS_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZN24CBO55","AWS_REGION":"us-west-1","CACHES_AWS_ACCESS_KEY_ID":"AKIA46X5W6CZI5DHEBFL","CODEGEN_BACKENDS":"llvm,cranelift","DEPLOY_BUCKET":"rust-lang-ci2","DIST_REQUIRE_ALL_TOOLS":1,"RUST_CONFIGURE_ARGS":"--build=i686-pc-windows-msvc --host=i686-pc-windows-msvc --target=i686-pc-windows-msvc,i586-pc-windows-msvc --enable-full-tools --enable-profiler","SCRIPT":"python x.py dist bootstrap --include-default-paths","TOOLSTATE_PUBLISH":1}}]

‎src/ci/scripts/verify-channel.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ IFS=$'\n\t'
88

99
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1010

11-
if isCiBranch auto || isCiBranch try || isCiBranch try-perf || \
12-
isCiBranch automation/bors/try || isCiBranch automation/bors/auto; then
11+
if isCiBranch try-perf || isCiBranch automation/bors/try || isCiBranch automation/bors/auto; then
1312
echo "channel verification is only executed on PR builds"
1413
exit
1514
fi

0 commit comments

Comments
 (0)