@@ -22,7 +22,6 @@ name: CI
2222 - try
2323 - try-perf
2424 - automation/bors/try
25- - master
2625 pull_request :
2726 branches :
2827 - " **"
@@ -35,6 +34,8 @@ defaults:
3534concurrency :
3635 group : " ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
3736 cancel-in-progress : true
37+ env :
38+ TOOLSTATE_REPO : " https://github.com/rust-lang-nursery/rust-toolstate"
3839jobs :
3940 calculate_matrix :
4041 name : Calculate job matrix
@@ -51,24 +52,23 @@ jobs:
5152 name : " ${{ matrix.name }}"
5253 needs :
5354 - calculate_matrix
55+ runs-on : " ${{ matrix.os }}"
56+ defaults :
57+ run :
58+ shell : " ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
59+ timeout-minutes : 600
5460 env :
5561 CI_JOB_NAME : " ${{ matrix.image }}"
5662 CARGO_REGISTRIES_CRATES_IO_PROTOCOL : sparse
5763 HEAD_SHA : " ${{ github.event.pull_request.head.sha || github.sha }}"
5864 DOCKER_TOKEN : " ${{ secrets.GITHUB_TOKEN }}"
5965 SCCACHE_BUCKET : rust-lang-ci-sccache2
60- TOOLSTATE_REPO : " https://github.com/rust-lang-nursery/rust-toolstate"
6166 CACHE_DOMAIN : ci-caches.rust-lang.org
6267 continue-on-error : " ${{ matrix.continue_on_error || false }}"
6368 strategy :
6469 matrix :
6570 include : " ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}"
6671 if : " fromJSON(needs.calculate_matrix.outputs.jobs)[0] != null"
67- defaults :
68- run :
69- shell : " ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
70- timeout-minutes : 600
71- runs-on : " ${{ matrix.os }}"
7272 steps :
7373 - if : " contains(matrix.os, 'windows')"
7474 uses : msys2/setup-msys2@v2.22.0
@@ -152,30 +152,6 @@ jobs:
152152 AWS_ACCESS_KEY_ID : " ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
153153 AWS_SECRET_ACCESS_KEY : " ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
154154 if : " success() && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
155- master :
156- name : master
157- runs-on : ubuntu-latest
158- env :
159- SCCACHE_BUCKET : rust-lang-ci-sccache2
160- DEPLOY_BUCKET : rust-lang-ci2
161- TOOLSTATE_REPO : " https://github.com/rust-lang-nursery/rust-toolstate"
162- TOOLSTATE_ISSUES_API_URL : " https://api.github.com/repos/rust-lang/rust/issues"
163- TOOLSTATE_PUBLISH : 1
164- CACHES_AWS_ACCESS_KEY_ID : AKIA46X5W6CZI5DHEBFL
165- ARTIFACTS_AWS_ACCESS_KEY_ID : AKIA46X5W6CZN24CBO55
166- AWS_REGION : us-west-1
167- CACHE_DOMAIN : ci-caches.rust-lang.org
168- if : " github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'"
169- steps :
170- - name : checkout the source code
171- uses : actions/checkout@v4
172- with :
173- fetch-depth : 2
174- - name : publish toolstate
175- run : src/ci/publish_toolstate.sh
176- shell : bash
177- env :
178- TOOLSTATE_REPO_ACCESS_TOKEN : " ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
179155 try-success :
180156 needs :
181157 - job
@@ -201,9 +177,15 @@ jobs:
201177 - job
202178 if : " success() && github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
203179 steps :
204- - name : mark the job as a success
205- run : exit 0
180+ - name : checkout the source code
181+ uses : actions/checkout@v4
182+ with :
183+ fetch-depth : 2
184+ - name : publish toolstate
185+ run : src/ci/publish_toolstate.sh
206186 shell : bash
187+ env :
188+ TOOLSTATE_REPO_ACCESS_TOKEN : " ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
207189 name : bors build finished
208190 runs-on : ubuntu-latest
209191 auto-failure :
0 commit comments