Skip to content

Commit 0a3d50e

Browse files
committed
Auto merge of rust-lang#141042 - marcoieni:split-dist-powerpc64le-linux, r=<try>
ci: split powerpc64le-linux job try-job: `dist-powerpc64le-linux-*`
2 parents d163a28 + 70f01c1 commit 0a3d50e

File tree

5 files changed

+47
-7
lines changed

5 files changed

+47
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
FROM 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+
COPY scripts/rustbuild-setup.sh /scripts/
10+
RUN sh /scripts/rustbuild-setup.sh
11+
12+
WORKDIR /tmp
13+
14+
COPY scripts/crosstool-ng-build.sh /scripts/
15+
RUN /scripts/crosstool-ng-build.sh
16+
17+
WORKDIR /build
18+
19+
RUN apt-get install -y --no-install-recommends rpm2cpio cpio
20+
COPY scripts/shared.sh scripts/build-powerpc64le-toolchain.sh /build/
21+
RUN ./build-powerpc64le-toolchain.sh
22+
23+
COPY scripts/sccache.sh /scripts/
24+
RUN sh /scripts/sccache.sh
25+
26+
ENV \
27+
AR_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-ar \
28+
CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
29+
CXX_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-g++
30+
31+
ENV HOSTS=powerpc64le-unknown-linux-gnu
32+
33+
ENV RUST_CONFIGURE_ARGS \
34+
--enable-extended \
35+
--enable-full-tools \
36+
--enable-profiler \
37+
--enable-sanitizers \
38+
--disable-docs
39+
40+
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN /scripts/crosstool-ng-build.sh
1818
WORKDIR /build
1919

2020
RUN apt-get install -y --no-install-recommends rpm2cpio cpio
21-
COPY scripts/shared.sh host-x86_64/dist-powerpc64le-linux/build-powerpc64le-toolchain.sh /build/
21+
COPY scripts/shared.sh scripts/build-powerpc64le-toolchain.sh /build/
2222
RUN ./build-powerpc64le-toolchain.sh
2323

2424
COPY scripts/sccache.sh /scripts/
@@ -27,14 +27,11 @@ RUN sh /scripts/sccache.sh
2727
ENV PATH=$PATH:/x-tools/powerpc64le-unknown-linux-musl/bin
2828

2929
ENV \
30-
AR_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-ar \
31-
CC_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-gcc \
32-
CXX_powerpc64le_unknown_linux_gnu=powerpc64le-linux-gnu-g++ \
3330
AR_powerpc64le_unknown_linux_musl=powerpc64le-unknown-linux-musl-ar \
3431
CC_powerpc64le_unknown_linux_musl=powerpc64le-unknown-linux-musl-gcc \
3532
CXX_powerpc64le_unknown_linux_musl=powerpc64le-unknown-linux-musl-g++
3633

37-
ENV HOSTS=powerpc64le-unknown-linux-gnu,powerpc64le-unknown-linux-musl
34+
ENV HOSTS=powerpc64le-unknown-linux-musl
3835

3936
ENV RUST_CONFIGURE_ARGS \
4037
--enable-extended \

src/ci/github-actions/jobs.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,11 @@ auto:
197197
- name: dist-powerpc64-linux
198198
<<: *job-linux-4c
199199

200-
- name: dist-powerpc64le-linux
201-
<<: *job-linux-4c-largedisk
200+
- name: dist-powerpc64le-linux-gnu
201+
<<: *job-linux-4c
202+
203+
- name: dist-powerpc64le-linux-musl
204+
<<: *job-linux-4c
202205

203206
- name: dist-riscv64-linux
204207
<<: *job-linux-4c

0 commit comments

Comments
 (0)