Skip to content

Commit 746cb95

Browse files
authored
feat(ci): add OpenHarmony CI and add it to tier2 (#2599)
1 parent 3d4f311 commit 746cb95

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

.github/workflows/ci.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ env:
1616
MSRV: 1.69.0
1717
# Rust's Loongarch support merged in 1.71.0
1818
MSRV_LOONGARCH: 1.71.0
19+
# Minimal Rust version to support all 3 official OpenHarmony targets as tier2
20+
MSRV_OHOS: 1.78.0
1921
RUSTFLAGS: -Dwarnings
2022

2123
jobs:
@@ -236,6 +238,9 @@ jobs:
236238
- target: s390x-unknown-linux-gnu
237239
- target: x86_64-unknown-linux-gnux32
238240
- target: x86_64-unknown-netbsd
241+
- target: aarch64-unknown-linux-ohos
242+
- target: armv7-unknown-linux-ohos
243+
- target: x86_64-unknown-linux-ohos
239244

240245
steps:
241246
- name: checkout
@@ -244,7 +249,8 @@ jobs:
244249
- name: setup Rust
245250
uses: dtolnay/rust-toolchain@master
246251
with:
247-
toolchain: '${{ env.MSRV }}'
252+
# Use a newer version rustc if it is OpenHarmony, remove this workaround after MSRV is newer than 1.78.0
253+
toolchain: "${{ contains(matrix.target, 'ohos') && env.MSRV_OHOS || env.MSRV }}"
248254
components: clippy
249255

250256
- name: install targets
@@ -259,7 +265,7 @@ jobs:
259265

260266
- name: before_cache_script
261267
run: rm -rf $CARGO_HOME/registry/index
262-
268+
263269

264270
redox:
265271
runs-on: ubuntu-latest

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,17 @@ The following targets are supported by `nix`:
8181
<ul>
8282
<li>aarch64-apple-ios</li>
8383
<li>aarch64-linux-android</li>
84+
<li>aarch64-unknown-linux-ohos</li>
8485
<li>arm-linux-androideabi</li>
8586
<li>arm-unknown-linux-musleabi</li>
8687
<li>armv7-linux-androideabi</li>
88+
<li>armv7-unknown-linux-ohos</li>
8789
<li>i686-linux-android</li>
8890
<li>loongarch64-unknown-linux-gnu</li>
8991
<li>s390x-unknown-linux-gnu</li>
9092
<li>x86_64-linux-android</li>
9193
<li>x86_64-unknown-illumos</li>
94+
<li>x86_64-unknown-linux-ohos</li>
9295
<li>x86_64-unknown-netbsd</li>
9396
</td>
9497
<td>

changelog/2599.added.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add OpenHarmony target into CI and Update documents.

0 commit comments

Comments
 (0)