Skip to content

Commit

Permalink
Auto merge of rust-lang#74675 - pietroalbini:aarch64-ci-fallible, r=M…
Browse files Browse the repository at this point in the history
…ark-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
  • Loading branch information
bors committed Aug 2, 2020
2 parents fd4d151 + fe5a40e commit e8876ae
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 10 additions & 0 deletions src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -586,6 +589,13 @@ jobs:
strategy:
matrix:
include:
#############################
# Linux/Docker builders #
#############################

- name: aarch64-gnu
<<: *job-aarch64-linux

####################
# macOS Builders #
####################
Expand Down
2 changes: 1 addition & 1 deletion src/ci/scripts/symlink-build-dir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions src/ci/shared.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ function isGitHubActions {
[[ "${GITHUB_ACTIONS-false}" = "true" ]]
}


function isSelfHostedGitHubActions {
[[ "${RUST_GHA_SELF_HOSTED-false}" = "true" ]]
}

function isMacOS {
[[ "${OSTYPE}" = "darwin"* ]]
}
Expand Down

0 comments on commit e8876ae

Please sign in to comment.