Skip to content

Commit

Permalink
Merge pull request #24 from Arceos-monolithic/fix_x86_64_ci
Browse files Browse the repository at this point in the history
pass ci checking
  • Loading branch information
elliott10 authored Mar 13, 2024
2 parents 3c373c2 + 6f98172 commit 14f9c3b
Show file tree
Hide file tree
Showing 326 changed files with 7,562 additions and 5,223 deletions.
15 changes: 13 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,22 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: Setup C++ environment
run: sudo apt-get update && sudo apt-get install -y build-essential
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ env.rust-toolchain }}
components: rust-src, clippy, rustfmt
- uses: ./.github/workflows/actions/setup-musl
with:
arch: x86_64
- uses: ./.github/workflows/actions/setup-musl
with:
arch: riscv64
- uses: ./.github/workflows/actions/setup-musl
with:
arch: aarch64
- name: Clippy for the default target
run: make clippy
- name: Clippy for x86_64
Expand Down Expand Up @@ -194,5 +205,5 @@ jobs:
crate: cargo-binutils
version: latest
use-tool-cache: true
- name: Bulld monolithic-oscomp
run: ./build_img.sh sdcard & make ARCH=${{ matrix.arch }} A=apps/oscomp
- name: Bulld monolithic-userboot
run: ./build_img.sh ${{ matrix.arch }} & make ARCH=${{ matrix.arch }} A=apps/monolithic_userboot
9 changes: 9 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ jobs:
with:
profile: minimal
toolchain: ${{ env.rust-toolchain }}
- uses: ./.github/workflows/actions/setup-musl
with:
arch: x86_64
- uses: ./.github/workflows/actions/setup-musl
with:
arch: riscv64
- uses: ./.github/workflows/actions/setup-musl
with:
arch: aarch64
- name: Build docs
continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
run: make doc_check_missing
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ qemu.log
rusty-tags.vi
/testcases/riscv64-linux-musl-native.tgz
/testcases/gcc/riscv64-linux-musl-native
testsuits-x86_64-linux-musl.tgz
.idea/
arceos-fada.bin.gz
arceos-fada.itb
114 changes: 0 additions & 114 deletions .idea/Starry.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

160 changes: 0 additions & 160 deletions .idea/workspace.xml

This file was deleted.

Loading

0 comments on commit 14f9c3b

Please sign in to comment.