Skip to content

Commit

Permalink
triagebot: re-enable merge commit check
Browse files Browse the repository at this point in the history
  • Loading branch information
RalfJung committed Oct 16, 2023
1 parent 446ab6f commit c72a095
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .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 Rustup' --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."
Expand Down
5 changes: 2 additions & 3 deletions triagebot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ allow-unauthenticated = [
# Gives us the commands 'ready', 'author', 'blocked'
[shortcut]

# disabled until https://github.com/rust-lang/triagebot/pull/1720 lands
#[no-merges]
#exclude_titles = ["Rollup of", "sync from rustc"]
[no-merges]
exclude_titles = ["Rustup"]

0 comments on commit c72a095

Please sign in to comment.