Skip to content

Commit 3bf9c5a

Browse files
committed
Auto merge of rust-lang#3058 - RalfJung:no-merge, r=saethlin
enforce no-merge policy via triagebot r? `@rust-lang/miri`
2 parents 864c3f3 + ee6b2ec commit 3bf9c5a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
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 '')
211+
PR=$(gh pr create -B master --title 'Automatic sync from rustc' --body '' --label subtree-sync)
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/triagebot.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ allow-unauthenticated = [
99

1010
# Gives us the commands 'ready', 'author', 'blocked'
1111
[shortcut]
12+
13+
[no-merges]
14+
exclude_labels = ["rollup", "subtree-sync"]

0 commit comments

Comments
 (0)