Skip to content

Commit 12f667f

Browse files
borsbors
committed
Auto merge of #77294 - shepmaster:try-anchors, r=pietroalbini
Use YAML anchors for try builds r? `@pietroalbini`
2 parents c0127e4 + 630e353 commit 12f667f

File tree

2 files changed

+117
-117
lines changed

2 files changed

+117
-117
lines changed

‎.github/workflows/ci.yml

+104-104
Original file line numberDiff line numberDiff line change
@@ -135,110 +135,6 @@ jobs:
135135
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
136136
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
137137
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
138-
try:
139-
name: try
140-
env:
141-
CI_JOB_NAME: "${{ matrix.name }}"
142-
SCCACHE_BUCKET: rust-lang-ci-sccache2
143-
DEPLOY_BUCKET: rust-lang-ci2
144-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
145-
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
146-
TOOLSTATE_PUBLISH: 1
147-
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
148-
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
149-
CACHE_DOMAIN: ci-caches.rust-lang.org
150-
if: "github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
151-
strategy:
152-
matrix:
153-
include:
154-
- name: dist-x86_64-linux
155-
os: ubuntu-latest-xl
156-
env: {}
157-
timeout-minutes: 600
158-
runs-on: "${{ matrix.os }}"
159-
steps:
160-
- name: disable git crlf conversion
161-
run: git config --global core.autocrlf false
162-
- name: checkout the source code
163-
uses: actions/checkout@v1
164-
with:
165-
fetch-depth: 2
166-
- name: configure the PR in which the error message will be posted
167-
run: "echo \"[CI_PR_NUMBER=$num]\""
168-
env:
169-
num: "${{ github.event.number }}"
170-
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
171-
- name: add extra environment variables
172-
run: src/ci/scripts/setup-environment.sh
173-
env:
174-
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
175-
if: success() && !env.SKIP_JOB
176-
- name: decide whether to skip this job
177-
run: src/ci/scripts/should-skip-this.sh
178-
if: success() && !env.SKIP_JOB
179-
- name: configure GitHub Actions to kill the build when outdated
180-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
181-
with:
182-
github_token: "${{ secrets.github_token }}"
183-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
184-
- name: collect CPU statistics
185-
run: src/ci/scripts/collect-cpu-stats.sh
186-
if: success() && !env.SKIP_JOB
187-
- name: show the current environment
188-
run: src/ci/scripts/dump-environment.sh
189-
if: success() && !env.SKIP_JOB
190-
- name: install awscli
191-
run: src/ci/scripts/install-awscli.sh
192-
if: success() && !env.SKIP_JOB
193-
- name: install sccache
194-
run: src/ci/scripts/install-sccache.sh
195-
if: success() && !env.SKIP_JOB
196-
- name: install clang
197-
run: src/ci/scripts/install-clang.sh
198-
if: success() && !env.SKIP_JOB
199-
- name: install WIX
200-
run: src/ci/scripts/install-wix.sh
201-
if: success() && !env.SKIP_JOB
202-
- name: ensure the build happens on a partition with enough space
203-
run: src/ci/scripts/symlink-build-dir.sh
204-
if: success() && !env.SKIP_JOB
205-
- name: disable git crlf conversion
206-
run: src/ci/scripts/disable-git-crlf-conversion.sh
207-
if: success() && !env.SKIP_JOB
208-
- name: install MSYS2
209-
run: src/ci/scripts/install-msys2.sh
210-
if: success() && !env.SKIP_JOB
211-
- name: install MinGW
212-
run: src/ci/scripts/install-mingw.sh
213-
if: success() && !env.SKIP_JOB
214-
- name: install ninja
215-
run: src/ci/scripts/install-ninja.sh
216-
if: success() && !env.SKIP_JOB
217-
- name: enable ipv6 on Docker
218-
run: src/ci/scripts/enable-docker-ipv6.sh
219-
if: success() && !env.SKIP_JOB
220-
- name: disable git crlf conversion
221-
run: src/ci/scripts/disable-git-crlf-conversion.sh
222-
if: success() && !env.SKIP_JOB
223-
- name: checkout submodules
224-
run: src/ci/scripts/checkout-submodules.sh
225-
if: success() && !env.SKIP_JOB
226-
- name: ensure line endings are correct
227-
run: src/ci/scripts/verify-line-endings.sh
228-
if: success() && !env.SKIP_JOB
229-
- name: run the build
230-
run: src/ci/scripts/run-build-from-ci.sh
231-
env:
232-
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
233-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
234-
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
235-
if: success() && !env.SKIP_JOB
236-
- name: upload artifacts to S3
237-
run: src/ci/scripts/upload-artifacts.sh
238-
env:
239-
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
240-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
241-
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
242138
auto:
243139
name: auto
244140
env:
@@ -694,6 +590,110 @@ jobs:
694590
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
695591
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
696592
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
593+
try:
594+
name: try
595+
env:
596+
CI_JOB_NAME: "${{ matrix.name }}"
597+
SCCACHE_BUCKET: rust-lang-ci-sccache2
598+
DEPLOY_BUCKET: rust-lang-ci2
599+
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
600+
TOOLSTATE_ISSUES_API_URL: "https://api.github.com/repos/rust-lang/rust/issues"
601+
TOOLSTATE_PUBLISH: 1
602+
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
603+
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
604+
CACHE_DOMAIN: ci-caches.rust-lang.org
605+
if: "github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
606+
strategy:
607+
matrix:
608+
include:
609+
- name: dist-x86_64-linux
610+
os: ubuntu-latest-xl
611+
env: {}
612+
timeout-minutes: 600
613+
runs-on: "${{ matrix.os }}"
614+
steps:
615+
- name: disable git crlf conversion
616+
run: git config --global core.autocrlf false
617+
- name: checkout the source code
618+
uses: actions/checkout@v1
619+
with:
620+
fetch-depth: 2
621+
- name: configure the PR in which the error message will be posted
622+
run: "echo \"[CI_PR_NUMBER=$num]\""
623+
env:
624+
num: "${{ github.event.number }}"
625+
if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
626+
- name: add extra environment variables
627+
run: src/ci/scripts/setup-environment.sh
628+
env:
629+
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
630+
if: success() && !env.SKIP_JOB
631+
- name: decide whether to skip this job
632+
run: src/ci/scripts/should-skip-this.sh
633+
if: success() && !env.SKIP_JOB
634+
- name: configure GitHub Actions to kill the build when outdated
635+
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
636+
with:
637+
github_token: "${{ secrets.github_token }}"
638+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
639+
- name: collect CPU statistics
640+
run: src/ci/scripts/collect-cpu-stats.sh
641+
if: success() && !env.SKIP_JOB
642+
- name: show the current environment
643+
run: src/ci/scripts/dump-environment.sh
644+
if: success() && !env.SKIP_JOB
645+
- name: install awscli
646+
run: src/ci/scripts/install-awscli.sh
647+
if: success() && !env.SKIP_JOB
648+
- name: install sccache
649+
run: src/ci/scripts/install-sccache.sh
650+
if: success() && !env.SKIP_JOB
651+
- name: install clang
652+
run: src/ci/scripts/install-clang.sh
653+
if: success() && !env.SKIP_JOB
654+
- name: install WIX
655+
run: src/ci/scripts/install-wix.sh
656+
if: success() && !env.SKIP_JOB
657+
- name: ensure the build happens on a partition with enough space
658+
run: src/ci/scripts/symlink-build-dir.sh
659+
if: success() && !env.SKIP_JOB
660+
- name: disable git crlf conversion
661+
run: src/ci/scripts/disable-git-crlf-conversion.sh
662+
if: success() && !env.SKIP_JOB
663+
- name: install MSYS2
664+
run: src/ci/scripts/install-msys2.sh
665+
if: success() && !env.SKIP_JOB
666+
- name: install MinGW
667+
run: src/ci/scripts/install-mingw.sh
668+
if: success() && !env.SKIP_JOB
669+
- name: install ninja
670+
run: src/ci/scripts/install-ninja.sh
671+
if: success() && !env.SKIP_JOB
672+
- name: enable ipv6 on Docker
673+
run: src/ci/scripts/enable-docker-ipv6.sh
674+
if: success() && !env.SKIP_JOB
675+
- name: disable git crlf conversion
676+
run: src/ci/scripts/disable-git-crlf-conversion.sh
677+
if: success() && !env.SKIP_JOB
678+
- name: checkout submodules
679+
run: src/ci/scripts/checkout-submodules.sh
680+
if: success() && !env.SKIP_JOB
681+
- name: ensure line endings are correct
682+
run: src/ci/scripts/verify-line-endings.sh
683+
if: success() && !env.SKIP_JOB
684+
- name: run the build
685+
run: src/ci/scripts/run-build-from-ci.sh
686+
env:
687+
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
688+
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
689+
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
690+
if: success() && !env.SKIP_JOB
691+
- name: upload artifacts to S3
692+
run: src/ci/scripts/upload-artifacts.sh
693+
env:
694+
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
695+
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
696+
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
697697
master:
698698
name: master
699699
runs-on: ubuntu-latest

‎src/ci/github-actions/ci.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -284,18 +284,6 @@ jobs:
284284
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
285285
<<: *job-linux-xl
286286

287-
try:
288-
<<: *base-ci-job
289-
name: try
290-
env:
291-
<<: [*shared-ci-variables, *prod-variables]
292-
if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'
293-
strategy:
294-
matrix:
295-
include:
296-
- name: dist-x86_64-linux
297-
<<: *job-linux-xl
298-
299287
auto:
300288
<<: *base-ci-job
301289
name: auto
@@ -378,7 +366,8 @@ jobs:
378366
- name: dist-x86_64-illumos
379367
<<: *job-linux-xl
380368

381-
- name: dist-x86_64-linux
369+
- &dist-x86_64-linux
370+
name: dist-x86_64-linux
382371
<<: *job-linux-xl
383372

384373
- name: dist-x86_64-linux-alt
@@ -634,6 +623,17 @@ jobs:
634623
- name: aarch64-gnu
635624
<<: *job-aarch64-linux
636625

626+
try:
627+
<<: *base-ci-job
628+
name: try
629+
env:
630+
<<: [*shared-ci-variables, *prod-variables]
631+
if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'
632+
strategy:
633+
matrix:
634+
include:
635+
- *dist-x86_64-linux
636+
637637
master:
638638
name: master
639639
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)