Skip to content

Commit 711f255

Browse files
committed
ci: split powerpc64le-linux job
1 parent ae3b909 commit 711f255

File tree

6 files changed

+65
-8
lines changed

6 files changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ RUN sh /scripts/rustbuild-setup.sh
1212
WORKDIR /tmp
1313

1414
COPY scripts/crosstool-ng-build.sh /scripts/
15-
COPY host-x86_64/dist-powerpc64le-linux/powerpc64le-unknown-linux-musl.defconfig /tmp/crosstool.defconfig
15+
COPY host-x86_64/dist-powerpc64le-linux-musl/powerpc64le-unknown-linux-musl.defconfig /tmp/crosstool.defconfig
1616
RUN /scripts/crosstool-ng-build.sh
1717

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 \
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
CT_CONFIG_VERSION="4"
2+
CT_EXPERIMENTAL=y
3+
CT_PREFIX_DIR="/x-tools/${CT_TARGET}"
4+
CT_USE_MIRROR=y
5+
CT_MIRROR_BASE_URL="https://ci-mirrors.rust-lang.org/rustc"
6+
CT_ARCH_POWERPC=y
7+
CT_ARCH_LE=y
8+
CT_ARCH_64=y
9+
# CT_DEMULTILIB is not set
10+
CT_ARCH_ARCH="powerpc64le"
11+
CT_KERNEL_LINUX=y
12+
CT_LINUX_V_4_19=y
13+
CT_LIBC_MUSL=y
14+
CT_MUSL_V_1_2_3=y
15+
CT_CC_LANG_CXX=y
16+
CT_GETTEXT_NEEDED=y

src/ci/github-actions/jobs.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,11 @@ auto:
203203
- name: dist-powerpc64-linux
204204
<<: *job-linux-4c
205205

206-
- name: dist-powerpc64le-linux
207-
<<: *job-linux-4c-largedisk
206+
- name: dist-powerpc64le-linux-gnu
207+
<<: *job-linux-4c
208+
209+
- name: dist-powerpc64le-linux-musl
210+
<<: *job-linux-4c
208211

209212
- name: dist-riscv64-linux
210213
<<: *job-linux-4c

0 commit comments

Comments
 (0)