Add integration for new bors
This commit is contained in:
parent
6710e3312d
commit
be50413ef0
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -542,7 +542,7 @@ jobs:
|
||||
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
|
||||
AWS_REGION: us-west-1
|
||||
CACHE_DOMAIN: ci-caches.rust-lang.org
|
||||
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:
|
||||
|
@ -25,6 +25,7 @@ Files: compiler/*
|
||||
README.md
|
||||
RELEASES.md
|
||||
rustfmt.toml
|
||||
rust-bors.toml
|
||||
triagebot.toml
|
||||
x
|
||||
x.ps1
|
||||
|
1
rust-bors.toml
Normal file
1
rust-bors.toml
Normal file
@ -0,0 +1 @@
|
||||
timeout = 7200
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user