about summary refs log tree commit diff
path: root/.github/workflows
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-10-08 01:48:31 +0000
committerbors <bors@rust-lang.org>2023-10-08 01:48:31 +0000
commitfdf32ee9fcd259913c7dece8f7b915b2d5560a49 (patch)
treeec6f7b5d1de43299ca23a68bc5b27eb72ed1ff72 /.github/workflows
parente9addfdecf14633324fc5c935f4f2983699bef7e (diff)
parent098dd979393e596a4434f5b88492054452b6b814 (diff)
Auto merge of #116450 - Kobzol:automation-try-bors-ci, r=Mark-Simulacrum
Enable new bors try branch to run on CI

Needed to fix [this error](https://github.com/rust-lang/rust/actions/runs/6420044833/job/17431256956). Inspired by https://github.com/rust-lang/rust/pull/99988

Also, removes `try-merge` from the workflow. It shouldn't have been added in https://github.com/rust-lang/rust/pull/116353.

r? `@Mark-Simulacrum`
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/ci.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4e599829097..8c207e7ea11 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,6 @@ name: CI
       - try
       - try-perf
       - automation/bors/try
-      - automation/bors/try-merge
       - master
   pull_request:
     branches: