diff options
| author | bors <bors@rust-lang.org> | 2023-09-11 17:14:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-11 17:14:09 +0000 |
| commit | 3bf9c5a00a29e6294fbc603cbdcb351175d9d5bf (patch) | |
| tree | 27cad4a215e928b97f5c5d7e2f139f6e1e2c247f /src/tools | |
| parent | 864c3f3cc544b813c8b5dabe1ab295f58aa43e2a (diff) | |
| parent | ee6b2ece2074a2065138a5e029793bfd5f592666 (diff) | |
| download | rust-3bf9c5a00a29e6294fbc603cbdcb351175d9d5bf.tar.gz rust-3bf9c5a00a29e6294fbc603cbdcb351175d9d5bf.zip | |
Auto merge of #3058 - RalfJung:no-merge, r=saethlin
enforce no-merge policy via triagebot r? `@rust-lang/miri`
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/miri/.github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | src/tools/miri/triagebot.toml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml index 5e2abdde6ac..bcbd44a5f38 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 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." diff --git a/src/tools/miri/triagebot.toml b/src/tools/miri/triagebot.toml index 21a154cafd4..69f3cd2f810 100644 --- a/src/tools/miri/triagebot.toml +++ b/src/tools/miri/triagebot.toml @@ -9,3 +9,6 @@ allow-unauthenticated = [ # Gives us the commands 'ready', 'author', 'blocked' [shortcut] + +[no-merges] +exclude_labels = ["rollup", "subtree-sync"] |