mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #3123 - RalfJung:triagebot, r=RalfJung

Browse Source 
triagebot: re-enable merge commit check

https://github.com/rust-lang/triagebot/pull/1720 has landed.

Also make the keyword "Rustup", which is what we've been already using for such PRs for a while. Just adjust the bot to also put that in the title.
This commit is contained in:
bors 2023-10-16 05:27:36 +00:00
commit c1dbc19670
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/miri/.github/workflows/ci.yml vendored
View File

@ -208,7 +208,7 @@ jobs:
git push -u origin $BRANCH git push -u origin $BRANCH
- name: Create Pull Request - name: Create Pull Request
run: | run: |
PR=$(gh pr create -B master --title 'Automatic sync from rustc' --body '') PR=$(gh pr create -B master --title 'Automatic Rustup' --body '')
~/.local/bin/zulip-send --user $ZULIP_BOT_EMAIL --api-key $ZULIP_API_TOKEN --site https://rust-lang.zulipchat.com \ ~/.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))" \ --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." --message "A PR doing a rustc-pull [has been automatically created]($PR) for your convenience."

5
src/tools/miri/triagebot.toml
View File

@ -10,6 +10,5 @@ allow-unauthenticated = [
# Gives us the commands 'ready', 'author', 'blocked' # Gives us the commands 'ready', 'author', 'blocked'
[shortcut] [shortcut]
# disabled until https://github.com/rust-lang/triagebot/pull/1720 lands [no-merges]
#[no-merges] exclude_titles = ["Rustup"]
#exclude_titles = ["Rollup of", "sync from rustc"]