diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2025-05-29 17:03:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-29 17:03:02 +0200 |
| commit | 5f6f23ad6a6c7580fa7ade8709413aa2d6643e66 (patch) | |
| tree | 933fea67f90c7feb6b00c34e829028722bcb84f3 | |
| parent | 8c708a473dd0b09547bdf489ce8a5d9a38743893 (diff) | |
| parent | 059bc382aae056efce7d64e743fe87950d14f16b (diff) | |
| download | rust-5f6f23ad6a6c7580fa7ade8709413aa2d6643e66.tar.gz rust-5f6f23ad6a6c7580fa7ade8709413aa2d6643e66.zip | |
Rollup merge of #141723 - Kobzol:new-bors-try, r=marcoieni
Provide secrets to try builds with new bors We need to use the `bors` environment on `automation/bors/try` to enable the new bors to do try builds. r? `@marcoieni`
| -rw-r--r-- | .github/workflows/ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12da1365b2b..4559246ce42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ concurrency: # For a given workflow, if we push to the same branch, cancel all previous builds on that branch. # We add an exception for try builds (try branch) and unrolled rollup builds (try-perf), which # are all triggered on the same branch, but which should be able to run concurrently. - group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }} + group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try') && github.sha) || github.ref }} cancel-in-progress: true env: TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate" @@ -80,7 +80,7 @@ jobs: # access the environment. # # We only enable the environment for the rust-lang/rust repository, so that CI works on forks. - environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/auto')) && 'bors') || '' }} + environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto')) && 'bors') || '' }} env: CI_JOB_NAME: ${{ matrix.name }} CI_JOB_DOC_URL: ${{ matrix.doc_url }} |