Skip to content

Commit 989ccae

Browse files
committed
Auto merge of rust-lang#141078 - marcoieni:split-dist-arm-linux, r=<try>
ci: split dist-arm-linux job try-job: `dist-arm-linux-*`
2 parents c79bbfa + 910730b commit 989ccae

File tree

4 files changed

+41
-10
lines changed

4 files changed

+41
-10
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
FROM ghcr.io/rust-lang/ubuntu:22.04
2+
3+
COPY scripts/cross-apt-packages.sh /scripts/
4+
RUN sh /scripts/cross-apt-packages.sh
5+
6+
COPY scripts/crosstool-ng.sh /scripts/
7+
RUN sh /scripts/crosstool-ng.sh
8+
9+
WORKDIR /build
10+
11+
COPY scripts/rustbuild-setup.sh /scripts/
12+
RUN sh /scripts/rustbuild-setup.sh
13+
WORKDIR /tmp
14+
15+
COPY scripts/crosstool-ng-build.sh /scripts/
16+
COPY host-x86_64/dist-arm-linux-gnueabi/arm-linux-gnueabi.defconfig /tmp/crosstool.defconfig
17+
RUN /scripts/crosstool-ng-build.sh
18+
19+
COPY scripts/sccache.sh /scripts/
20+
RUN sh /scripts/sccache.sh
21+
22+
ENV PATH=$PATH:/x-tools/arm-unknown-linux-gnueabi/bin
23+
24+
ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \
25+
AR_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-ar \
26+
CXX_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-g++
27+
28+
ENV HOSTS=arm-unknown-linux-gnueabi
29+
30+
ENV RUST_CONFIGURE_ARGS \
31+
--enable-full-tools \
32+
--disable-docs \
33+
--enable-sanitizers \
34+
--enable-profiler \
35+
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile renamed to src/ci/docker/host-x86_64/dist-arm-linux-musl/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,12 @@ RUN sh /scripts/rustbuild-setup.sh
1919
WORKDIR /tmp
2020

2121
COPY scripts/crosstool-ng-build.sh /scripts/
22-
COPY host-x86_64/dist-arm-linux/arm-linux-gnueabi.defconfig /tmp/crosstool.defconfig
2322
RUN /scripts/crosstool-ng-build.sh
2423

2524
COPY scripts/sccache.sh /scripts/
2625
RUN sh /scripts/sccache.sh
2726

28-
ENV PATH=$PATH:/x-tools/arm-unknown-linux-gnueabi/bin
29-
30-
ENV CC_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-gcc \
31-
AR_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-ar \
32-
CXX_arm_unknown_linux_gnueabi=arm-unknown-linux-gnueabi-g++
33-
34-
ENV HOSTS=arm-unknown-linux-gnueabi,aarch64-unknown-linux-musl
27+
ENV HOSTS=aarch64-unknown-linux-musl
3528

3629
ENV RUST_CONFIGURE_ARGS \
3730
--enable-full-tools \

src/ci/github-actions/jobs.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,11 @@ auto:
167167
- name: dist-android
168168
<<: *job-linux-4c
169169

170-
- name: dist-arm-linux
171-
<<: *job-linux-8c-codebuild
170+
- name: dist-arm-linux-gnueabi
171+
<<: *job-linux-4c
172+
173+
- name: dist-arm-linux-musl
174+
<<: *job-linux-4c
172175

173176
- name: dist-armhf-linux
174177
<<: *job-linux-4c

0 commit comments

Comments
 (0)