about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-10-01 04:00:34 +0000
committerbors <bors@rust-lang.org>2023-10-01 04:00:34 +0000
commit361096fa4b77e7fd9effec0a7feef139565d7a25 (patch)
tree0124d4670a5a32fd005e03e5762214e606e10675 /src/ci
parent18f02991535620211f075e2165f72ec8b64338ce (diff)
parentbe50413ef00fde789e185352e3f8bf109d0f2a99 (diff)
downloadrust-361096fa4b77e7fd9effec0a7feef139565d7a25.tar.gz
rust-361096fa4b77e7fd9effec0a7feef139565d7a25.zip
Auto merge of #116225 - Kobzol:newbors-integration, r=Mark-Simulacrum
Add integration for new bors

I think that the best way to test the [new bors](https://github.com/rust-lang/bors/tree/staging) implementation is to start using it in the wild. This PR integrates this repo with the bot (some more integration has to be done externally through GitHub). For now, I would suggest to integrate it e.g. under the ``@borsnew`` name, and start testing its try build functionality. The bot cannot do merges or approvals yet, and it doesn't touch `master` in any way, so hopefully it shouldn't cause any troubles for this repo.

r? `@Mark-Simulacrum`
Diffstat (limited to 'src/ci')
-rw-r--r--src/ci/github-actions/ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index cbf848cb4a3..6d25b2c9cc2 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -691,7 +691,7 @@ jobs:
     env:
       DIST_TRY_BUILD: 1
       <<: [*shared-ci-variables, *prod-variables]
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'
+    if: github.event_name == 'push' && (((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust') || ((github.ref == 'refs/heads/automation/bors/try') && github.repository == 'rust-lang/rust'))
     strategy:
       matrix:
         include: