Skip to content

Commit b1f880b

Browse files
authored
Merge pull request #135 from syswonder/dev
Merge dev into main
2 parents c54f363 + 3be0dc6 commit b1f880b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+3666
-180
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ jobs:
1212
fail-fast: false
1313
steps:
1414
- uses: actions/checkout@v3
15+
with:
16+
submodules: recursive
1517
- uses: actions-rs/toolchain@v1
1618
with:
1719
profile: minimal
1820
toolchain: ${{ env.rust-toolchain }}
1921
components: rust-src, clippy, rustfmt
22+
- name: Install gcc multilib
23+
run: sudo apt update && sudo apt install -y gcc-multilib
2024
- name: Clippy for the default target
21-
run: make clippy
25+
run: make clippy
2226
- name: Clippy for x86_64
2327
run: make clippy ARCH=x86_64
2428
- name: Clippy for riscv64
@@ -37,6 +41,8 @@ jobs:
3741
arch: [x86_64, riscv64, aarch64]
3842
steps:
3943
- uses: actions/checkout@v3
44+
with:
45+
submodules: recursive
4046
- uses: actions-rs/toolchain@v1
4147
with:
4248
profile: minimal
@@ -47,6 +53,8 @@ jobs:
4753
crate: cargo-binutils
4854
version: latest
4955
use-tool-cache: true
56+
- name: Install gcc multilib
57+
run: sudo apt update && sudo apt install -y gcc-multilib
5058
# musl toolchain is also needed in non-musl apps
5159
# because we need to build opensbi under riscv64
5260
- uses: ./.github/workflows/actions/setup-musl

.github/workflows/docs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ jobs:
1616
default-branch: ${{ format('refs/heads/{0}', github.event.repository.default_branch) }}
1717
steps:
1818
- uses: actions/checkout@v3
19+
with:
20+
submodules: recursive
1921
- uses: actions-rs/toolchain@v1
2022
with:
2123
profile: minimal
2224
toolchain: ${{ env.rust-toolchain }}
25+
- name: Install gcc multilib
26+
run: sudo apt update && sudo apt install -y gcc-multilib
2327
- name: Build docs
2428
continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
2529
run: make doc_check_missing

.github/workflows/test.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v3
14+
with:
15+
submodules: recursive
1416
- uses: actions-rs/toolchain@v1
1517
with:
1618
profile: minimal
1719
toolchain: ${{ env.rust-toolchain }}
18-
components: rust-src
20+
components: rust-src, llvm-tools-preview
1921
- name: Run unit tests
2022
run: make unittest_no_fail_fast
2123

@@ -28,16 +30,20 @@ jobs:
2830
arch: [x86_64, riscv64, aarch64]
2931
steps:
3032
- uses: actions/checkout@v3
33+
with:
34+
submodules: recursive
3135
- uses: actions-rs/toolchain@v1
3236
with:
3337
profile: minimal
3438
toolchain: ${{ env.rust-toolchain }}
35-
components: rust-src
39+
components: rust-src, llvm-tools-preview
3640
- uses: actions-rs/install@v0.1
3741
with:
3842
crate: cargo-binutils
3943
version: latest
4044
use-tool-cache: true
45+
- name: Install gcc multilib
46+
run: sudo apt update && sudo apt install -y gcc-multilib
4147
- uses: ./.github/workflows/actions/setup-qemu
4248
with:
4349
qemu-version: ${{ env.qemu-version }}

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "patches/opensbi"]
22
path = patches/opensbi
33
url = https://github.com/Sssssaltyfish/opensbi.git
4+
[submodule "crates/lwip_rust/depend/lwip"]
5+
path = crates/lwip_rust/depend/lwip
6+
url = https://github.com/lwip-tcpip/lwip.git

0 commit comments

Comments
 (0)