Skip to content

Commit e8876ae

Browse files
committed
Auto merge of #74675 - pietroalbini:aarch64-ci-fallible, r=Mark-Simulacrum
Add fallible AArch64 CI builder This adds the `aarch64-gnu` CI builder to the `auto-fallible` job, as a first step in the process of actually gating on it. r? @Mark-Simulacrum
2 parents fd4d151 + fe5a40e commit e8876ae

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

.github/workflows/ci.yml

+5
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,11 @@ jobs:
577577
strategy:
578578
matrix:
579579
include:
580+
- name: aarch64-gnu
581+
os:
582+
- self-hosted
583+
- ARM64
584+
- linux
580585
- name: dist-x86_64-apple
581586
env:
582587
SCRIPT: "./x.py dist"

src/ci/github-actions/ci.yml

+10
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ x--expand-yaml-anchors--remove:
8484
os: windows-latest-xl
8585
<<: *base-job
8686

87+
- &job-aarch64-linux
88+
os: [self-hosted, ARM64, linux]
89+
8790
- &step
8891
if: success() && !env.SKIP_JOB
8992

@@ -586,6 +589,13 @@ jobs:
586589
strategy:
587590
matrix:
588591
include:
592+
#############################
593+
# Linux/Docker builders #
594+
#############################
595+
596+
- name: aarch64-gnu
597+
<<: *job-aarch64-linux
598+
589599
####################
590600
# macOS Builders #
591601
####################

src/ci/scripts/symlink-build-dir.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1212
if isWindows && isAzurePipelines; then
1313
cmd //c "mkdir c:\\MORE_SPACE"
1414
cmd //c "mklink /J build c:\\MORE_SPACE"
15-
elif isLinux && isGitHubActions; then
15+
elif isLinux && isGitHubActions && ! isSelfHostedGitHubActions; then
1616
sudo mkdir -p /mnt/more-space
1717
sudo chown -R "$(whoami):" /mnt/more-space
1818

src/ci/shared.sh

+5
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ function isGitHubActions {
3838
[[ "${GITHUB_ACTIONS-false}" = "true" ]]
3939
}
4040

41+
42+
function isSelfHostedGitHubActions {
43+
[[ "${RUST_GHA_SELF_HOSTED-false}" = "true" ]]
44+
}
45+
4146
function isMacOS {
4247
[[ "${OSTYPE}" = "darwin"* ]]
4348
}

0 commit comments

Comments
 (0)