diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2023-09-28 10:18:20 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2023-09-28 10:43:24 +0200 |
| commit | be50413ef00fde789e185352e3f8bf109d0f2a99 (patch) | |
| tree | 05a471a520141ea38e339af390d00b13a2f70b30 | |
| parent | 6710e3312d54f03f6462481199b9e72367a2568b (diff) | |
| download | rust-be50413ef00fde789e185352e3f8bf109d0f2a99.tar.gz rust-be50413ef00fde789e185352e3f8bf109d0f2a99.zip | |
Add integration for new bors
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | .reuse/dep5 | 1 | ||||
| -rw-r--r-- | rust-bors.toml | 1 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dcc9556965..624608cc477 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: diff --git a/.reuse/dep5 b/.reuse/dep5 index 5546a7cf391..245ed2659f9 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -25,6 +25,7 @@ Files: compiler/* README.md RELEASES.md rustfmt.toml + rust-bors.toml triagebot.toml x x.ps1 diff --git a/rust-bors.toml b/rust-bors.toml new file mode 100644 index 00000000000..54f4f641248 --- /dev/null +++ b/rust-bors.toml @@ -0,0 +1 @@ +timeout = 7200 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: |