Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 0031282

Browse filesBrowse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #141036 - marcoieni:split-dist-ohos, r=Kobzol
ci: split the dist-ohos job try-job: `dist-ohos-*`
2 parents 04bc9d1 + 839534e commit 0031282
Copy full SHA for 0031282

File tree

4 files changed

+114
-20
lines changed
Filter options

4 files changed

+114
-20
lines changed

‎src/ci/docker/host-x86_64/dist-ohos/Dockerfile renamed to ‎src/ci/docker/host-x86_64/dist-ohos-aarch64/Dockerfile

Copy file name to clipboardExpand all lines: src/ci/docker/host-x86_64/dist-ohos-aarch64/Dockerfile
-18Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,18 @@ RUN sh /scripts/ohos-openssl.sh
2727

2828
COPY scripts/ohos/aarch64-unknown-linux-ohos-clang.sh /usr/local/bin/
2929
COPY scripts/ohos/aarch64-unknown-linux-ohos-clang++.sh /usr/local/bin/
30-
COPY scripts/ohos/armv7-unknown-linux-ohos-clang.sh /usr/local/bin/
31-
COPY scripts/ohos/armv7-unknown-linux-ohos-clang++.sh /usr/local/bin/
32-
COPY scripts/ohos/x86_64-unknown-linux-ohos-clang.sh /usr/local/bin/
33-
COPY scripts/ohos/x86_64-unknown-linux-ohos-clang++.sh /usr/local/bin/
3430

3531
# env
3632
ENV AARCH64_UNKNOWN_LINUX_OHOS_OPENSSL_DIR=/opt/ohos-openssl/prelude/arm64-v8a
37-
ENV ARMV7_UNKNOWN_LINUX_OHOS_OPENSSL_DIR=/opt/ohos-openssl/prelude/armeabi-v7a
38-
ENV X86_64_UNKNOWN_LINUX_OHOS_OPENSSL_DIR=/opt/ohos-openssl/prelude/x86_64
3933

4034
ENV AARCH64_UNKNOWN_LINUX_OHOS_OPENSSL_NO_VENDOR=1
41-
ENV ARMV7_UNKNOWN_LINUX_OHOS_OPENSSL_NO_VENDOR=1
42-
ENV X86_64_UNKNOWN_LINUX_OHOS_OPENSSL_NO_VENDOR=1
4335

4436
ENV TARGETS=aarch64-unknown-linux-ohos
45-
ENV TARGETS=$TARGETS,armv7-unknown-linux-ohos
46-
ENV TARGETS=$TARGETS,x86_64-unknown-linux-ohos
4737

4838
ENV \
4939
CC_aarch64_unknown_linux_ohos=/usr/local/bin/aarch64-unknown-linux-ohos-clang.sh \
5040
AR_aarch64_unknown_linux_ohos=/opt/ohos-sdk/native/llvm/bin/llvm-ar \
5141
CXX_aarch64_unknown_linux_ohos=/usr/local/bin/aarch64-unknown-linux-ohos-clang++.sh
52-
ENV \
53-
CC_armv7_unknown_linux_ohos=/usr/local/bin/armv7-unknown-linux-ohos-clang.sh \
54-
AR_armv7_unknown_linux_ohos=/opt/ohos-sdk/native/llvm/bin/llvm-ar \
55-
CXX_armv7_unknown_linux_ohos=/usr/local/bin/armv7-unknown-linux-ohos-clang++.sh
56-
ENV \
57-
CC_x86_64_unknown_linux_ohos=/usr/local/bin/x86_64-unknown-linux-ohos-clang.sh \
58-
AR_x86_64_unknown_linux_ohos=/opt/ohos-sdk/native/llvm/bin/llvm-ar \
59-
CXX_x86_64_unknown_linux_ohos=/usr/local/bin/x86_64-unknown-linux-ohos-clang++.sh
6042

6143
ENV RUST_CONFIGURE_ARGS \
6244
--enable-profiler \

‎src/ci/docker/host-x86_64/dist-ohos-armv7/Dockerfile

Copy file name to clipboard
+53Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
FROM ubuntu:24.04
2+
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
5+
g++ \
6+
make \
7+
ninja-build \
8+
file \
9+
curl \
10+
ca-certificates \
11+
python3 \
12+
git \
13+
cmake \
14+
sudo \
15+
gdb \
16+
libssl-dev \
17+
pkg-config \
18+
xz-utils \
19+
unzip \
20+
&& rm -rf /var/lib/apt/lists/*
21+
22+
COPY scripts/ohos-sdk.sh /scripts/
23+
RUN sh /scripts/ohos-sdk.sh
24+
25+
COPY scripts/ohos-openssl.sh /scripts/
26+
RUN sh /scripts/ohos-openssl.sh
27+
28+
COPY scripts/ohos/armv7-unknown-linux-ohos-clang.sh /usr/local/bin/
29+
COPY scripts/ohos/armv7-unknown-linux-ohos-clang++.sh /usr/local/bin/
30+
31+
# env
32+
ENV ARMV7_UNKNOWN_LINUX_OHOS_OPENSSL_DIR=/opt/ohos-openssl/prelude/armeabi-v7a
33+
34+
ENV ARMV7_UNKNOWN_LINUX_OHOS_OPENSSL_NO_VENDOR=1
35+
36+
ENV TARGETS=armv7-unknown-linux-ohos
37+
38+
ENV \
39+
CC_armv7_unknown_linux_ohos=/usr/local/bin/armv7-unknown-linux-ohos-clang.sh \
40+
AR_armv7_unknown_linux_ohos=/opt/ohos-sdk/native/llvm/bin/llvm-ar \
41+
CXX_armv7_unknown_linux_ohos=/usr/local/bin/armv7-unknown-linux-ohos-clang++.sh
42+
43+
ENV RUST_CONFIGURE_ARGS \
44+
--enable-profiler \
45+
--disable-docs \
46+
--tools=cargo,clippy,rustdocs,rustfmt,rust-analyzer,rust-analyzer-proc-macro-srv,analysis,src,wasm-component-ld \
47+
--enable-extended \
48+
--enable-sanitizers
49+
50+
ENV SCRIPT python3 ../x.py dist --host=$TARGETS --target $TARGETS
51+
52+
COPY scripts/sccache.sh /scripts/
53+
RUN sh /scripts/sccache.sh

‎src/ci/docker/host-x86_64/dist-ohos-x86_64/Dockerfile

Copy file name to clipboard
+53Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
FROM ubuntu:24.04
2+
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
5+
g++ \
6+
make \
7+
ninja-build \
8+
file \
9+
curl \
10+
ca-certificates \
11+
python3 \
12+
git \
13+
cmake \
14+
sudo \
15+
gdb \
16+
libssl-dev \
17+
pkg-config \
18+
xz-utils \
19+
unzip \
20+
&& rm -rf /var/lib/apt/lists/*
21+
22+
COPY scripts/ohos-sdk.sh /scripts/
23+
RUN sh /scripts/ohos-sdk.sh
24+
25+
COPY scripts/ohos-openssl.sh /scripts/
26+
RUN sh /scripts/ohos-openssl.sh
27+
28+
COPY scripts/ohos/x86_64-unknown-linux-ohos-clang.sh /usr/local/bin/
29+
COPY scripts/ohos/x86_64-unknown-linux-ohos-clang++.sh /usr/local/bin/
30+
31+
# env
32+
ENV X86_64_UNKNOWN_LINUX_OHOS_OPENSSL_DIR=/opt/ohos-openssl/prelude/x86_64
33+
34+
ENV X86_64_UNKNOWN_LINUX_OHOS_OPENSSL_NO_VENDOR=1
35+
36+
ENV TARGETS=x86_64-unknown-linux-ohos
37+
38+
ENV \
39+
CC_x86_64_unknown_linux_ohos=/usr/local/bin/x86_64-unknown-linux-ohos-clang.sh \
40+
AR_x86_64_unknown_linux_ohos=/opt/ohos-sdk/native/llvm/bin/llvm-ar \
41+
CXX_x86_64_unknown_linux_ohos=/usr/local/bin/x86_64-unknown-linux-ohos-clang++.sh
42+
43+
ENV RUST_CONFIGURE_ARGS \
44+
--enable-profiler \
45+
--disable-docs \
46+
--tools=cargo,clippy,rustdocs,rustfmt,rust-analyzer,rust-analyzer-proc-macro-srv,analysis,src,wasm-component-ld \
47+
--enable-extended \
48+
--enable-sanitizers
49+
50+
ENV SCRIPT python3 ../x.py dist --host=$TARGETS --target $TARGETS
51+
52+
COPY scripts/sccache.sh /scripts/
53+
RUN sh /scripts/sccache.sh

‎src/ci/github-actions/jobs.yml

Copy file name to clipboardExpand all lines: src/ci/github-actions/jobs.yml
+8-2Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,14 @@ auto:
188188
- name: dist-loongarch64-musl
189189
<<: *job-linux-4c
190190

191-
- name: dist-ohos
192-
<<: *job-linux-4c-largedisk
191+
- name: dist-ohos-aarch64
192+
<<: *job-linux-4c
193+
194+
- name: dist-ohos-armv7
195+
<<: *job-linux-4c
196+
197+
- name: dist-ohos-x86_64
198+
<<: *job-linux-4c
193199

194200
- name: dist-powerpc-linux
195201
<<: *job-linux-4c

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.