Skip to content

Update ArceOS #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Update ArceOS #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
602a303
refactor: update arceos
AsakuraMizu Jul 7, 2025
4708e2c
fix ci build
AsakuraMizu Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 51 additions & 16 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,29 @@ jobs:
matrix:
rust-toolchain: [nightly, nightly-2025-05-20]
arch: [x86_64, riscv64, aarch64, loongarch64]
include:
- arch: x86_64
target: x86_64-unknown-none
- arch: riscv64
target: riscv64gc-unknown-none-elf
- arch: aarch64
target: aarch64-unknown-none-softfloat
- arch: loongarch64
target: loongarch64-unknown-none-softfloat
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust-toolchain }}
components: rust-src, clippy, rustfmt
targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none, aarch64-unknown-none-softfloat, loongarch64-unknown-none
- name: Setup ArceOS
run: ./scripts/get_deps.sh
targets: ${{ matrix.target }}
- name: Check rust version
run: rustc --version --verbose
- uses: arceos-org/setup-musl@v1
with:
arch: ${{ matrix.arch }}
- name: Setup ArceOS
run: ./scripts/get_deps.sh
- name: Check code format
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
run: cargo fmt --all -- --check
Expand All @@ -35,86 +44,110 @@ jobs:
run: make clippy ARCH=${{ matrix.arch }}

build:
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
arch: [x86_64, riscv64, aarch64, loongarch64]
rust-toolchain: [nightly, nightly-2025-05-20]
include:
- arch: x86_64
target: x86_64-unknown-none
- arch: riscv64
target: riscv64gc-unknown-none-elf
- arch: aarch64
target: aarch64-unknown-none-softfloat
- arch: loongarch64
target: loongarch64-unknown-none-softfloat
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust-toolchain }}
components: rust-src, llvm-tools
targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none, aarch64-unknown-none-softfloat, loongarch64-unknown-none
targets: ${{ matrix.target }}
- uses: Swatinem/rust-cache@v2
with:
shared-key: cargo-bin-cache
cache-targets: false
- run: cargo install cargo-binutils
- run: ./scripts/get_deps.sh
- uses: arceos-org/setup-musl@v1
with:
arch: ${{ matrix.arch }}
- name: Setup ArceOS
run: ./scripts/get_deps.sh
- name: Build for ${{ matrix.arch }}
continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
run: make ARCH=${{ matrix.arch }} build

test-musl:
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
arch: [x86_64, riscv64, aarch64, loongarch64]
rust-toolchain: [nightly-2025-05-20]
include:
- arch: x86_64
target: x86_64-unknown-none
- arch: riscv64
target: riscv64gc-unknown-none-elf
- arch: aarch64
target: aarch64-unknown-none-softfloat
- arch: loongarch64
target: loongarch64-unknown-none-softfloat
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust-toolchain }}
components: rust-src, llvm-tools
targets: ${{ matrix.target }}
- uses: Swatinem/rust-cache@v2
with:
shared-key: cargo-bin-cache
cache-targets: false
- run: cargo install cargo-binutils
- run: ./scripts/get_deps.sh
- uses: arceos-org/setup-musl@v1
with:
arch: ${{ matrix.arch }}
- uses: arceos-org/setup-qemu@v1
with:
version: ${{ env.qemu-version }}
arch_list: x86_64,aarch64,riscv64,loongarch64
- name: Setup ArceOS
run: ./scripts/get_deps.sh
- name: Build rustup target
if: ${{ matrix.arch != 'riscv64' }}
run: rustup target add ${{ matrix.arch }}-unknown-linux-musl
- name: Run tests for musl applications
run: make test ARCH=${{ matrix.arch }}

test-oscomp:
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
arch: [x86_64, riscv64, aarch64, loongarch64]
rust-toolchain: [nightly-2025-05-20]
include:
- arch: x86_64
target: x86_64-unknown-none
- arch: riscv64
target: riscv64gc-unknown-none-elf
- arch: aarch64
target: aarch64-unknown-none-softfloat
- arch: loongarch64
target: loongarch64-unknown-none-softfloat
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust-toolchain }}
components: rust-src, llvm-tools
targets: ${{ matrix.target }}
- uses: Swatinem/rust-cache@v2
with:
shared-key: cargo-bin-cache
cache-targets: false
- run: cargo install cargo-binutils
- run: ./scripts/get_deps.sh
- uses: arceos-org/setup-musl@v1
with:
arch: ${{ matrix.arch }}
Expand All @@ -131,6 +164,8 @@ jobs:
gunzip sdcard-${{ matrix.arch }}.img.gz
- name: Build python environment
run: sudo apt-get install -y python3 python3-pip
- name: Setup ArceOS
run: ./scripts/get_deps.sh
- name: Run tests for oscomp musl testcases
run: make oscomp_test ARCH=${{ matrix.arch }} LIBC=musl
- name: Run tests for oscomp glibc testcases
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
with:
shared-key: cargo-bin-cache
cache-targets: false
- run: cargo install cargo-binutils
- run: ./scripts/get_deps.sh
- uses: arceos-org/setup-musl@v1
with:
arch: x86_64
- name: Setup ArceOS
run: ./scripts/get_deps.sh
- name: Build docs
continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
run: make doc
Expand Down
Loading
Loading