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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 565c916db5b5d186b6c73c7006a7eed445ed450e..86f60349c67771dcd0fc0f0fb504948382e16067 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -577,6 +577,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - name: aarch64-gnu
+            os:
+              - self-hosted
+              - ARM64
+              - linux
           - name: dist-x86_64-apple
             env:
               SCRIPT: "./x.py dist"

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index a7c1987e8b1c9182ec1ae21a2661b73a2d832d5a..8a6973bcdd6c91ce6048a98acc809349480b1730 100644 (file)
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -84,6 +84,9 @@ x--expand-yaml-anchors--remove:
     os: windows-latest-xl
     <<: *base-job
 
+  - &job-aarch64-linux
+    os: [self-hosted, ARM64, linux]
+
   - &step
     if: success() && !env.SKIP_JOB
 
@@ -586,6 +589,13 @@ jobs:
     strategy:
       matrix:
         include:
+          #############################
+          #   Linux/Docker builders   #
+          #############################
+
+          - name: aarch64-gnu
+            <<: *job-aarch64-linux
+
           ####################
           #  macOS Builders  #
           ####################

diff --git a/src/ci/scripts/symlink-build-dir.sh b/src/ci/scripts/symlink-build-dir.sh
index 50178b9c33ed46eb783c2fd788ec92aba1a84bf6..28d8aa3b6e71a156ec9a58eeb91967d1cfa8eba5 100755 (executable)
--- a/src/ci/scripts/symlink-build-dir.sh
+++ b/src/ci/scripts/symlink-build-dir.sh
@@ -12,7 +12,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 if isWindows && isAzurePipelines; then
     cmd //c "mkdir c:\\MORE_SPACE"
     cmd //c "mklink /J build c:\\MORE_SPACE"
-elif isLinux && isGitHubActions; then
+elif isLinux && isGitHubActions && ! isSelfHostedGitHubActions; then
     sudo mkdir -p /mnt/more-space
     sudo chown -R "$(whoami):" /mnt/more-space
 

diff --git a/src/ci/shared.sh b/src/ci/shared.sh
index 206065d7072451b9aa4297e722817ca8a2be39be..8222758ed6dc4e5bf62eec89239bb0415fe657d1 100644 (file)
--- a/src/ci/shared.sh
+++ b/src/ci/shared.sh
@@ -38,6 +38,11 @@ function isGitHubActions {
     [[ "${GITHUB_ACTIONS-false}" = "true" ]]
 }
 
+
+function isSelfHostedGitHubActions {
+    [[ "${RUST_GHA_SELF_HOSTED-false}" = "true" ]]
+}
+
 function isMacOS {
     [[ "${OSTYPE}" = "darwin"* ]]
 }