diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcbd44a5f3..5e2abdde6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -208,7 +208,7 @@ jobs: git push -u origin $BRANCH - name: Create Pull Request run: | - PR=$(gh pr create -B master --title 'Automatic sync from rustc' --body '' --label subtree-sync) + PR=$(gh pr create -B master --title 'Automatic sync from rustc' --body '') ~/.local/bin/zulip-send --user $ZULIP_BOT_EMAIL --api-key $ZULIP_API_TOKEN --site https://rust-lang.zulipchat.com \ --stream miri --subject "Cron Job Failure (miri, $(date -u +%Y-%m))" \ --message "A PR doing a rustc-pull [has been automatically created]($PR) for your convenience." diff --git a/miri-script/src/commands.rs b/miri-script/src/commands.rs index 124acc9509..a9c7eaf146 100644 --- a/miri-script/src/commands.rs +++ b/miri-script/src/commands.rs @@ -339,9 +339,9 @@ impl Command { "Confirmed that the push round-trips back to Miri properly. Please create a rustc PR:" ); println!( - // Open PR with `subtree-sync` label to satisfy the `no-merges` triagebot check + // Open PR with `subtree update` title to satisfy the `no-merges` triagebot check // See https://github.com/rust-lang/rust/pull/114157 - " https://github.com/rust-lang/rust/compare/{github_user}:{branch}?quick_pull=1&labels=subtree-sync" + " https://github.com/rust-lang/rust/compare/{github_user}:{branch}?quick_pull=1&title=Miri+subtree+update" ); drop(josh); diff --git a/triagebot.toml b/triagebot.toml index 69f3cd2f81..8d00cedb76 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -11,4 +11,4 @@ allow-unauthenticated = [ [shortcut] [no-merges] -exclude_labels = ["rollup", "subtree-sync"] +exclude_titles = ["Rollup of", "sync from rustc"]