about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-10-04 07:46:03 +0000
committerbors <bors@rust-lang.org>2023-10-04 07:46:03 +0000
commit9fbd593a56387354ea44a72f45f4df1850704f5f (patch)
tree5526172aea5b989292de52a4c67232338495d2af
parentdd513e1150569d2c5605bcdd4b2a6741deea3294 (diff)
parent76b70eb0337836cf3197fb29e85195f9375e48be (diff)
downloadrust-9fbd593a56387354ea44a72f45f4df1850704f5f.tar.gz
rust-9fbd593a56387354ea44a72f45f4df1850704f5f.zip
Auto merge of #116353 - Kobzol:new-bors-event, r=Mark-Simulacrum
Add new bors try branches to CI

Workflows for the new bors weren't launching, because its branches weren't whitelisted here.

r? `@Mark-Simulacrum`
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--src/ci/github-actions/ci.yml2
2 files changed, 4 insertions, 0 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 624608cc477..323de1c92c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,8 @@ name: CI
       - auto
       - try
       - try-perf
+      - automation/bors/try
+      - automation/bors/try-merge
       - master
   pull_request:
     branches:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 6d25b2c9cc2..f1dc507fa03 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -281,6 +281,8 @@ on:
       - auto
       - try
       - try-perf
+      - automation/bors/try
+      - automation/bors/try-merge
       - master
   pull_request:
     branches: