Add integration for new bors

This commit is contained in:
Jakub Beránek 2023-09-28 10:18:20 +02:00
parent 6710e3312d
commit be50413ef0
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
4 changed files with 4 additions and 2 deletions

View File

@ -542,7 +542,7 @@ jobs:
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55 ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
AWS_REGION: us-west-1 AWS_REGION: us-west-1
CACHE_DOMAIN: ci-caches.rust-lang.org 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: strategy:
matrix: matrix:
include: include:

View File

@ -25,6 +25,7 @@ Files: compiler/*
README.md README.md
RELEASES.md RELEASES.md
rustfmt.toml rustfmt.toml
rust-bors.toml
triagebot.toml triagebot.toml
x x
x.ps1 x.ps1

1
rust-bors.toml Normal file
View File

@ -0,0 +1 @@
timeout = 7200

View File

@ -691,7 +691,7 @@ jobs:
env: env:
DIST_TRY_BUILD: 1 DIST_TRY_BUILD: 1
<<: [*shared-ci-variables, *prod-variables] <<: [*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: strategy:
matrix: matrix:
include: include: