Skip to content

Commit

Permalink
chore: fix the CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Azure-stars committed May 2, 2024
1 parent 360c5ef commit e105092
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 17 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ jobs:
with:
arch: aarch64
- name: Clippy for the default target
run: make clippy
run: make pre_c && make clippy
- name: Clippy for x86_64
run: make clippy ARCH=x86_64
run: make pre_c && make clippy ARCH=x86_64
- name: Clippy for riscv64
run: make clippy ARCH=riscv64
run: make pre_c && make clippy ARCH=riscv64
- name: Clippy for aarch64
run: make clippy ARCH=aarch64
run: make pre_c && make clippy ARCH=aarch64
- name: Check code format
run: cargo fmt --all -- --check

Expand Down Expand Up @@ -95,21 +95,21 @@ jobs:
with:
arch: ${{ matrix.arch }}
- name: Build c/helloworld
run: make ARCH=${{ matrix.arch }} A=apps/c/helloworld
run: make pre_c && make ARCH=${{ matrix.arch }} A=apps/c/helloworld
- name: Build c/memtest
run: make ARCH=${{ matrix.arch }} A=apps/c/memtest
run: make pre_c && make ARCH=${{ matrix.arch }} A=apps/c/memtest
- name: Build c/sqlite3
run: make ARCH=${{ matrix.arch }} A=apps/c/sqlite3
run: make pre_c && make ARCH=${{ matrix.arch }} A=apps/c/sqlite3
- name: Build c/httpclient
run: make ARCH=${{ matrix.arch }} A=apps/c/httpclient
run: make pre_c && make ARCH=${{ matrix.arch }} A=apps/c/httpclient
- name: Build c/httpserver
run: make ARCH=${{ matrix.arch }} A=apps/c/httpserver
run: make pre_c && make ARCH=${{ matrix.arch }} A=apps/c/httpserver
- name: Build c/udpserver
run: make ARCH=${{ matrix.arch }} A=apps/c/udpserver
run: make pre_c && make ARCH=${{ matrix.arch }} A=apps/c/udpserver
- name: Build c/iperf
run: make ARCH=${{ matrix.arch }} A=apps/c/iperf
run: make pre_c && make ARCH=${{ matrix.arch }} A=apps/c/iperf
- name: Build c/redis
run: make ARCH=${{ matrix.arch }} A=apps/c/redis SMP=4
run: make pre_c && make ARCH=${{ matrix.arch }} A=apps/c/redis SMP=4

build-apps-for-other-platforms:
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -139,9 +139,9 @@ jobs:
- name: Build net/httpserver for x86_64-pc-oslab
run: make PLATFORM=x86_64-pc-oslab A=apps/net/httpserver FEATURES=driver-ixgbe
- name: Build c/iperf for x86_64-pc-oslab
run: make PLATFORM=x86_64-pc-oslab A=apps/c/iperf FEATURES=driver-ixgbe,driver-ramdisk
run: make pre_c && make PLATFORM=x86_64-pc-oslab A=apps/c/iperf FEATURES=driver-ixgbe,driver-ramdisk
- name: Build c/redis for x86_64-pc-oslab
run: make PLATFORM=x86_64-pc-oslab A=apps/c/redis FEATURES=driver-ixgbe,driver-ramdisk SMP=4
run: make pre_c && make PLATFORM=x86_64-pc-oslab A=apps/c/redis FEATURES=driver-ixgbe,driver-ramdisk SMP=4

- name: Build helloworld for aarch64-raspi4
run: make PLATFORM=aarch64-raspi4 A=apps/helloworld
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
arch: aarch64
- name: Build docs
continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
run: make doc_check_missing
run: make pre_c && make doc_check_missing
- name: Deploy to Github Pages
if: ${{ github.ref == env.default-branch }}
uses: JamesIves/github-pages-deploy-action@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Run app tests
run: |
make disk_img
make test ARCH=${{ matrix.arch }}
make pre_c && make test ARCH=${{ matrix.arch }}
app-test-for-monolithic:
runs-on: ${{ matrix.os }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ arceos-fada.itb
.tmp_its
!tools/rk3588/ramdisk.img
linker_*
crates/axlibc/*
6 changes: 6 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/make/cargo.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ define cargo_clippy
$(call run_cmd,cargo clippy,-p axlog -p percpu -p percpu_macros $(1) $(verbose))
endef

all_packages := $(wildcard $(CURDIR)/crates/*)
all_packages := $(shell ls $(CURDIR)/crates)

define cargo_doc
$(call run_cmd,cargo doc,--no-deps --all-features --workspace --exclude "arceos-*" $(verbose))
Expand Down

0 comments on commit e105092

Please sign in to comment.