Skip to content

Commit

Permalink
Auto merge of rust-lang#3058 - RalfJung:no-merge, r=saethlin
Browse files Browse the repository at this point in the history
enforce no-merge policy via triagebot

r? `@rust-lang/miri`
  • Loading branch information
bors committed Sep 11, 2023
2 parents 864c3f3 + ee6b2ec commit 3bf9c5a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/miri/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 '')
PR=$(gh pr create -B master --title 'Automatic sync from rustc' --body '' --label subtree-sync)
~/.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."
Expand Down
3 changes: 3 additions & 0 deletions src/tools/miri/triagebot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ allow-unauthenticated = [

# Gives us the commands 'ready', 'author', 'blocked'
[shortcut]

[no-merges]
exclude_labels = ["rollup", "subtree-sync"]

0 comments on commit 3bf9c5a

Please sign in to comment.