From 1c928f936fd17b62cf0f064758c80b8279f21a70 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 16 Oct 2023 07:25:12 +0200 Subject: [PATCH] triagebot: re-enable merge commit check --- src/tools/miri/.github/workflows/ci.yml | 2 +- src/tools/miri/triagebot.toml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml index f026b7fd104..a5c5cb0d6cc 100644 --- a/src/tools/miri/.github/workflows/ci.yml +++ b/src/tools/miri/.github/workflows/ci.yml @@ -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." diff --git a/src/tools/miri/triagebot.toml b/src/tools/miri/triagebot.toml index 1c520a9c779..3b767b3e62f 100644 --- a/src/tools/miri/triagebot.toml +++ b/src/tools/miri/triagebot.toml @@ -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"]