Skip to content

Commit 5cc5281

Browse files
shepmastershepmaster
committed
[HACK] Perform try builds for aarch64-apple-darwin; disable PR CI
1 parent 821b03d commit 5cc5281

File tree

2 files changed

+39
-156
lines changed

2 files changed

+39
-156
lines changed

‎.github/workflows/ci.yml

+14-130
Original file line numberDiff line numberDiff line change
@@ -35,133 +35,6 @@ concurrency:
3535
group: "${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
3636
cancel-in-progress: true
3737
jobs:
38-
pr:
39-
name: "PR - ${{ matrix.name }}"
40-
env:
41-
PR_CI_JOB: 1
42-
CI_JOB_NAME: "${{ matrix.name }}"
43-
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
44-
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
45-
SCCACHE_BUCKET: rust-lang-ci-sccache2
46-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
47-
CACHE_DOMAIN: ci-caches.rust-lang.org
48-
if: "github.event_name == 'pull_request'"
49-
continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
50-
strategy:
51-
matrix:
52-
include:
53-
- name: mingw-check
54-
os: ubuntu-20.04-4core-16gb
55-
env: {}
56-
- name: mingw-check-tidy
57-
os: ubuntu-20.04-4core-16gb
58-
env: {}
59-
- name: x86_64-gnu-llvm-15
60-
os: ubuntu-20.04-16core-64gb
61-
env: {}
62-
- name: x86_64-gnu-tools
63-
os: ubuntu-20.04-16core-64gb
64-
env: {}
65-
timeout-minutes: 600
66-
runs-on: "${{ matrix.os }}"
67-
steps:
68-
- name: disable git crlf conversion
69-
run: git config --global core.autocrlf false
70-
- name: checkout the source code
71-
uses: actions/checkout@v4
72-
with:
73-
fetch-depth: 2
74-
- name: configure the PR in which the error message will be posted
75-
run: "echo \"[CI_PR_NUMBER=$num]\""
76-
env:
77-
num: "${{ github.event.number }}"
78-
if: "success() && !env.SKIP_JOB && github.event_name == 'pull_request'"
79-
- name: add extra environment variables
80-
run: src/ci/scripts/setup-environment.sh
81-
env:
82-
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
83-
if: success() && !env.SKIP_JOB
84-
- name: decide whether to skip this job
85-
run: src/ci/scripts/should-skip-this.sh
86-
if: success() && !env.SKIP_JOB
87-
- name: ensure the channel matches the target branch
88-
run: src/ci/scripts/verify-channel.sh
89-
if: success() && !env.SKIP_JOB
90-
- name: collect CPU statistics
91-
run: src/ci/scripts/collect-cpu-stats.sh
92-
if: success() && !env.SKIP_JOB
93-
- name: show the current environment
94-
run: src/ci/scripts/dump-environment.sh
95-
if: success() && !env.SKIP_JOB
96-
- name: install awscli
97-
run: src/ci/scripts/install-awscli.sh
98-
if: success() && !env.SKIP_JOB
99-
- name: install sccache
100-
run: src/ci/scripts/install-sccache.sh
101-
if: success() && !env.SKIP_JOB
102-
- name: select Xcode
103-
run: src/ci/scripts/select-xcode.sh
104-
if: success() && !env.SKIP_JOB
105-
- name: install clang
106-
run: src/ci/scripts/install-clang.sh
107-
if: success() && !env.SKIP_JOB
108-
- name: install WIX
109-
run: src/ci/scripts/install-wix.sh
110-
if: success() && !env.SKIP_JOB
111-
- name: disable git crlf conversion
112-
run: src/ci/scripts/disable-git-crlf-conversion.sh
113-
if: success() && !env.SKIP_JOB
114-
- name: checkout submodules
115-
run: src/ci/scripts/checkout-submodules.sh
116-
if: success() && !env.SKIP_JOB
117-
- name: install MSYS2
118-
run: src/ci/scripts/install-msys2.sh
119-
if: success() && !env.SKIP_JOB
120-
- name: install MinGW
121-
run: src/ci/scripts/install-mingw.sh
122-
if: success() && !env.SKIP_JOB
123-
- name: install ninja
124-
run: src/ci/scripts/install-ninja.sh
125-
if: success() && !env.SKIP_JOB
126-
- name: enable ipv6 on Docker
127-
run: src/ci/scripts/enable-docker-ipv6.sh
128-
if: success() && !env.SKIP_JOB
129-
- name: disable git crlf conversion
130-
run: src/ci/scripts/disable-git-crlf-conversion.sh
131-
if: success() && !env.SKIP_JOB
132-
- name: ensure line endings are correct
133-
run: src/ci/scripts/verify-line-endings.sh
134-
if: success() && !env.SKIP_JOB
135-
- name: ensure backported commits are in upstream branches
136-
run: src/ci/scripts/verify-backported-commits.sh
137-
if: success() && !env.SKIP_JOB
138-
- name: ensure the stable version number is correct
139-
run: src/ci/scripts/verify-stable-version-number.sh
140-
if: success() && !env.SKIP_JOB
141-
- name: run the build
142-
run: src/ci/scripts/run-build-from-ci.sh
143-
env:
144-
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
145-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
146-
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
147-
if: success() && !env.SKIP_JOB
148-
- name: create github artifacts
149-
run: src/ci/scripts/create-doc-artifacts.sh
150-
if: success() && !env.SKIP_JOB
151-
- name: upload artifacts to github
152-
uses: actions/upload-artifact@v3
153-
with:
154-
name: "${{ env.DOC_ARTIFACT_NAME }}"
155-
path: obj/artifacts/doc
156-
if-no-files-found: ignore
157-
retention-days: 5
158-
if: success() && !env.SKIP_JOB
159-
- name: upload artifacts to S3
160-
run: src/ci/scripts/upload-artifacts.sh
161-
env:
162-
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
163-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
164-
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
16538
auto:
16639
name: "auto - ${{ matrix.name }}"
16740
env:
@@ -549,9 +422,20 @@ jobs:
549422
strategy:
550423
matrix:
551424
include:
552-
- name: dist-x86_64-linux
553-
os: ubuntu-20.04-16core-64gb
554-
env: {}
425+
- name: dist-aarch64-apple
426+
env:
427+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
428+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
429+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
430+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
431+
USE_XCODE_CLANG: 1
432+
MACOSX_DEPLOYMENT_TARGET: 11.0
433+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
434+
NO_LLVM_ASSERTIONS: 1
435+
NO_DEBUG_ASSERTIONS: 1
436+
NO_OVERFLOW_CHECKS: 1
437+
DIST_REQUIRE_ALL_TOOLS: 1
438+
os: macos-13-xlarge
555439
timeout-minutes: 600
556440
runs-on: "${{ matrix.os }}"
557441
steps:

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

+25-26
Original file line numberDiff line numberDiff line change
@@ -313,28 +313,28 @@ concurrency:
313313
cancel-in-progress: true
314314

315315
jobs:
316-
pr:
317-
<<: *base-ci-job
318-
name: PR - ${{ matrix.name }}
319-
env:
320-
<<: [*shared-ci-variables, *public-variables]
321-
PR_CI_JOB: 1
322-
if: github.event_name == 'pull_request'
323-
continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
324-
strategy:
325-
matrix:
326-
include:
327-
- name: mingw-check
328-
<<: *job-linux-4c
329-
330-
- name: mingw-check-tidy
331-
<<: *job-linux-4c
332-
333-
- name: x86_64-gnu-llvm-15
334-
<<: *job-linux-16c
335-
336-
- name: x86_64-gnu-tools
337-
<<: *job-linux-16c
316+
# pr:
317+
# <<: *base-ci-job
318+
# name: PR - ${{ matrix.name }}
319+
# env:
320+
# <<: [*shared-ci-variables, *public-variables]
321+
# PR_CI_JOB: 1
322+
# if: github.event_name == 'pull_request'
323+
# continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
324+
# strategy:
325+
# matrix:
326+
# include:
327+
# - name: mingw-check
328+
# <<: *job-linux-4c
329+
330+
# - name: mingw-check-tidy
331+
# <<: *job-linux-4c
332+
333+
# - name: x86_64-gnu-llvm-15
334+
# <<: *job-linux-16c
335+
336+
# - name: x86_64-gnu-tools
337+
# <<: *job-linux-16c
338338

339339
auto:
340340
<<: *base-ci-job
@@ -529,7 +529,8 @@ jobs:
529529
<<: *job-macos-xl
530530

531531
# This target only needs to support 11.0 and up as nothing else supports the hardware
532-
- name: dist-aarch64-apple
532+
- &dist-aarch64-apple
533+
name: dist-aarch64-apple
533534
env:
534535
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
535536
RUST_CONFIGURE_ARGS: >-
@@ -690,9 +691,7 @@ jobs:
690691
strategy:
691692
matrix:
692693
include:
693-
- &dist-x86_64-linux
694-
name: dist-x86_64-linux
695-
<<: *job-linux-16c
694+
- <<: *dist-aarch64-apple
696695

697696
master:
698697
name: master

0 commit comments

Comments
 (0)