Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 25e7808

Browse files
committed
Auto merge of rust-lang#3062 - pitaj:subtree-update, r=RalfJung
triagebot exclude_labels -> exclude_titles rust-lang/triagebot#1720
2 parents 0398759 + 09fd7a8 commit 25e7808

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/tools/miri/.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ jobs:
208208
git push -u origin $BRANCH
209209
- name: Create Pull Request
210210
run: |
211-
PR=$(gh pr create -B master --title 'Automatic sync from rustc' --body '' --label subtree-sync)
211+
PR=$(gh pr create -B master --title 'Automatic sync from rustc' --body '')
212212
~/.local/bin/zulip-send --user $ZULIP_BOT_EMAIL --api-key $ZULIP_API_TOKEN --site https://rust-lang.zulipchat.com \
213213
--stream miri --subject "Cron Job Failure (miri, $(date -u +%Y-%m))" \
214214
--message "A PR doing a rustc-pull [has been automatically created]($PR) for your convenience."

src/tools/miri/miri-script/src/commands.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ impl Command {
339339
"Confirmed that the push round-trips back to Miri properly. Please create a rustc PR:"
340340
);
341341
println!(
342-
// Open PR with `subtree-sync` label to satisfy the `no-merges` triagebot check
342+
// Open PR with `subtree update` title to silence the `no-merges` triagebot check
343343
// See https://github.com/rust-lang/rust/pull/114157
344-
" https://github.com/rust-lang/rust/compare/{github_user}:{branch}?quick_pull=1&labels=subtree-sync"
344+
" https://github.com/rust-lang/rust/compare/{github_user}:{branch}?quick_pull=1&title=Miri+subtree+update"
345345
);
346346

347347
drop(josh);

src/tools/miri/triagebot.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ allow-unauthenticated = [
1111
[shortcut]
1212

1313
[no-merges]
14-
exclude_labels = ["rollup", "subtree-sync"]
14+
exclude_titles = ["Rollup of", "sync from rustc"]

0 commit comments

Comments
 (0)