Skip to content
/ rust Public
forked from rust-lang/rust

Commit be50413

Browse files
committed
Add integration for new bors
1 parent 6710e33 commit be50413

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ jobs:
542542
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
543543
AWS_REGION: us-west-1
544544
CACHE_DOMAIN: ci-caches.rust-lang.org
545-
if: "github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
545+
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'))"
546546
strategy:
547547
matrix:
548548
include:

.reuse/dep5

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Files: compiler/*
2525
README.md
2626
RELEASES.md
2727
rustfmt.toml
28+
rust-bors.toml
2829
triagebot.toml
2930
x
3031
x.ps1

rust-bors.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
timeout = 7200

src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ jobs:
691691
env:
692692
DIST_TRY_BUILD: 1
693693
<<: [*shared-ci-variables, *prod-variables]
694-
if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'
694+
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'))
695695
strategy:
696696
matrix:
697697
include:

0 commit comments

Comments
 (0)