diff options
| author | bors <bors@rust-lang.org> | 2023-10-01 04:00:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-01 04:00:34 +0000 |
| commit | 361096fa4b77e7fd9effec0a7feef139565d7a25 (patch) | |
| tree | 0124d4670a5a32fd005e03e5762214e606e10675 | |
| parent | 18f02991535620211f075e2165f72ec8b64338ce (diff) | |
| parent | be50413ef00fde789e185352e3f8bf109d0f2a99 (diff) | |
| download | rust-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`
| -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: |