Skip to content

Commit 9a13ef2

Browse files
committed
Auto merge of #73650 - pietroalbini:ci-aarch64-gnu, r=Mark-Simulacrum
Add Docker image to run AArch64 Linux tests This PR adds a Docker image to run the AArch64 Linux test suite on a native AArch64 host platform, which will be used in the future to run the test suite in our CI. The image will also be useful for ARM folks to ensure internally that the bugfixes they submit work. This will be the first Docker image designed to run on a non-x86_64 host platform, and to prevent surprising behavior this PR moves all images requiring a x86_64 host in the `src/ci/docker/host-x86_64` directory. Paths and scripts are changed accordingly, and a helpful error message is added when someone tries to run an image on the wrong architecture: ``` Invalid image: aarch64-gnu Note: the image exists for the aarch64 host architecture Note: the current host architecture is x86_64 ``` The old emulated and disabled `aarch64-gnu` builder is also removed in this PR. This PR is best reviewed commit-by-commit. r? @Mark-Simulacrum
2 parents f844ea1 + 775eeb3 commit 9a13ef2

File tree

120 files changed

+137
-3251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+137
-3251
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ jobs:
428428
os: windows-latest-xl
429429
- name: x86_64-msvc-tools
430430
env:
431-
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
431+
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
432432
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json"
433433
os: windows-latest-xl
434434
- name: i686-mingw-1

src/ci/azure-pipelines/auto.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
NO_LLVM_ASSERTIONS: 1
152152
# MSVC tools tests
153153
x86_64-msvc-tools:
154-
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py
154+
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py
155155
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json
156156

157157
# 32/64-bit MinGW builds.

src/ci/docker/README.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ before running your command.
2525

2626
## Filesystem layout
2727

28-
- Each directory, excluding `scripts` and `disabled`, corresponds to a docker image
29-
- `scripts` contains files shared by docker images
30-
- `disabled` contains images that are not built on CI
28+
- Each host architecture has its own `host-{arch}` directory, and those
29+
directories contain a subdirectory for each Docker image (plus the `disabled`
30+
subdirectory).
31+
- `host-{arch}/disabled` contains images that are not built on CI.
32+
- `scripts` contains files shared by multiple Docker images.
3133

3234
## Docker Toolbox on Windows
3335

src/ci/docker/disabled/aarch64-gnu/Dockerfile

-79
This file was deleted.

0 commit comments

Comments
 (0)