Skip to content

Commit 7e52baa

Browse files
authored
Merge pull request #278 from arceos-org/v0.2.0-pre
2 parents d51d602 + a49e36b commit 7e52baa

File tree

23 files changed

+126
-130
lines changed

23 files changed

+126
-130
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ulib/axlibc/include/**/*.h linguist-vendored

.github/workflows/build.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ jobs:
1919
toolchain: ${{ matrix.rust-toolchain }}
2020
components: rust-src, clippy, rustfmt
2121
targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
22-
- uses: Swatinem/rust-cache@v2
23-
with:
24-
shared-key: cargo-bin-cache
25-
cache-targets: false
2622
- name: Check rust version
2723
run: rustc --version --verbose
2824
- name: Check code format
@@ -55,7 +51,7 @@ jobs:
5551
targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
5652
- uses: Swatinem/rust-cache@v2
5753
with:
58-
shared-key: cargo-bin-cache
54+
shared-key: cargo-bin-cache-${{ matrix.rust-toolchain }}
5955
cache-targets: false
6056
- name: Build helloworld
6157
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
@@ -100,10 +96,10 @@ jobs:
10096
targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
10197
- uses: Swatinem/rust-cache@v2
10298
with:
103-
shared-key: cargo-bin-cache
99+
shared-key: cargo-bin-cache-${{ matrix.rust-toolchain }}
104100
cache-targets: false
105101

106-
# Test various config files
102+
# Test custom config file
107103
- name: Build helloworld for x86_64-pc-oslab
108104
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
109105
run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml A=examples/helloworld
@@ -140,27 +136,23 @@ jobs:
140136
run: |
141137
make MYPLAT=axplat-aarch64-bsta1000b defconfig
142138
make MYPLAT=axplat-aarch64-bsta1000b A=examples/helloworld-myplat APP_FEATURES=aarch64-bsta1000b
143-
144139
- name: Build helloworld-myplat for aarch64-phytium-pi
145140
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
146141
run: |
147142
make MYPLAT=axplat-aarch64-phytium-pi defconfig
148143
make MYPLAT=axplat-aarch64-phytium-pi A=examples/helloworld-myplat APP_FEATURES=aarch64-phytium-pi
149-
150144
- name: Build helloworld-myplat for loongarch64-qemu-virt
151145
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
152146
run: |
153147
make ARCH=loongarch64 defconfig
154148
make ARCH=loongarch64 A=examples/helloworld-myplat SMP=4 APP_FEATURES=loongarch64-qemu-virt
155149
make MYPLAT=axplat-loongarch64-qemu-virt A=examples/helloworld-myplat SMP=4 APP_FEATURES=loongarch64-qemu-virt
156-
157150
- name: Build helloworld-myplat for riscv64-qemu-virt
158151
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
159152
run: |
160153
make ARCH=riscv64 defconfig
161154
make ARCH=riscv64 A=examples/helloworld-myplat SMP=4 APP_FEATURES=riscv64-qemu-virt
162155
make MYPLAT=axplat-riscv64-qemu-virt A=examples/helloworld-myplat SMP=4 APP_FEATURES=riscv64-qemu-virt
163-
164156
165157
# Test platform `aarch64-raspi4` for various apps
166158
- name: Setup aarch64-raspi4
@@ -210,7 +202,7 @@ jobs:
210202
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
211203
run: make MYPLAT=axplat-aarch64-phytium-pi A=examples/shell FEATURES=page-alloc-4g,driver-ramdisk BUS=mmio
212204

213-
# Test various config files for C apps
205+
# Test custom config file for C apps
214206
- uses: arceos-org/setup-musl@v1
215207
with:
216208
arch: x86_64
@@ -233,22 +225,23 @@ jobs:
233225
fail-fast: false
234226
matrix:
235227
rust-toolchain: [nightly, nightly-2025-05-20]
228+
env:
229+
RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
236230
steps:
237231
- uses: actions/checkout@v4
238232
- uses: dtolnay/rust-toolchain@stable
239233
with:
240234
toolchain: ${{ matrix.rust-toolchain }}
241-
components: rust-src, clippy
235+
components: rust-src, clippy, llvm-tools
242236
targets: x86_64-unknown-none
243237
- uses: Swatinem/rust-cache@v2
244238
with:
245-
shared-key: cargo-bin-cache
239+
shared-key: cargo-bin-cache-${{ matrix.rust-toolchain }}
246240
cache-targets: false
247241
- name: Clippy for the default target
248242
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
249243
run: make clippy
250244

251-
- run: cargo install cargo-binutils
252245
- name: Build helloworld
253246
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
254247
run: make A=examples/helloworld

.github/workflows/docs.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ jobs:
2121
- uses: dtolnay/rust-toolchain@stable
2222
with:
2323
toolchain: ${{ env.rust-toolchain }}
24-
- uses: Swatinem/rust-cache@v2
25-
with:
26-
shared-key: cargo-bin-cache
27-
cache-targets: false
2824
- name: Build docs
2925
run: make doc_check_missing ARCH=${{ matrix.os == 'macos-latest' && 'aarch64' || 'x86_64' }}
3026
- name: Deploy to Github Pages

.github/workflows/test.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
- uses: dtolnay/rust-toolchain@stable
1616
with:
1717
toolchain: ${{ env.rust-toolchain }}
18-
components: rust-src
1918
- name: Run unit tests
2019
run: make unittest_no_fail_fast
2120

@@ -26,15 +25,18 @@ jobs:
2625
matrix:
2726
os: [ubuntu-latest]
2827
arch: [x86_64, riscv64, aarch64, loongarch64]
28+
env:
29+
RUSTUP_TOOLCHAIN: nightly-2025-05-20
2930
steps:
3031
- uses: actions/checkout@v4
3132
- uses: dtolnay/rust-toolchain@stable
3233
with:
3334
toolchain: ${{ env.rust-toolchain }}
34-
components: rust-src
35+
components: rust-src, llvm-tools
36+
targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
3537
- uses: Swatinem/rust-cache@v2
3638
with:
37-
shared-key: cargo-bin-cache
39+
shared-key: cargo-bin-cache-${{ env.rust-toolchain }}
3840
cache-targets: false
3941
- uses: arceos-org/setup-qemu@v1
4042
with:

0 commit comments

Comments
 (0)