Merge pull request #20 from Starry-OS/fix_ci

Fix Starry CI after updating rustc version

.github/workflows/build.yml

@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-        rust-toolchain: [nightly-2024-05-02]
+        rust-toolchain: [nightly, nightly-2024-05-02]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
       WORKING_DIRECTORY: ${{ needs.prepare_for_external_test.outputs.TopTestDirectory }}
@@ -63,6 +63,9 @@ jobs:
     - name: Clone Top Repository
       if: github.repository != 'Starry-OS/Starry'
       run: git clone https://github.com/Starry-OS/Starry.git ${{ env.WORKING_DIRECTORY }} && cd ${{ env.WORKING_DIRECTORY }} && git checkout ${{ inputs.TopBranch }}
+    - name: Update Top Repository
+      working-directory: ${{ env.WORKING_DIRECTORY }}
+      run: make pre_update
     - name: Check rust version
       working-directory: ${{ env.WORKING_DIRECTORY }}
       run: rustc --version --verbose      
@@ -90,7 +93,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64]
-        rust-toolchain: [nightly-2024-05-02]
+        rust-toolchain: [nightly, nightly-2024-05-02]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
       WORKING_DIRECTORY: ${{ needs.prepare_for_external_test.outputs.TopTestDirectory }}
@@ -189,7 +192,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        rust-toolchain: [nightly-2024-05-02]
+        rust-toolchain: [nightly, nightly-2024-05-02]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
       WORKING_DIRECTORY: ${{ needs.prepare_for_external_test.outputs.TopTestDirectory }}
@@ -311,7 +314,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64]
-        rust-toolchain: [nightly-2024-05-02]
+        rust-toolchain: [nightly, nightly-2024-05-02]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
       WORKING_DIRECTORY: ${{ needs.prepare_for_external_test.outputs.TopTestDirectory }}

Makefile

@@ -46,10 +46,10 @@ STRUCT ?= Unikernel
 override FEATURES += fp_simd
 
 # QEMU options
-BLK ?= y
-NET ?= y
+BLK ?= n
+NET ?= n
 GRAPHIC ?= n
-BUS ?= mmio
+BUS ?= pci
 
 DISK_IMG ?= disk.img
 QEMU_LOG ?= n

scripts/make/features.mk

@@ -62,8 +62,8 @@ else
   $(error "LOG" must be one of "off", "error", "warn", "info", "debug", "trace")
 endif
 
-ifeq ($(BUS),pci)
-  ax_feat += bus-pci
+ifeq ($(BUS),mmio)
+  ax_feat += bus-mmio
 endif
 
 ifeq ($(shell test $(SMP) -gt 1; echo $$?),0)

scripts/test/app_test_for_monolithic.sh

@@ -67,7 +67,7 @@ function test_one() {
     local args=$1
     local actual="$APP/actual.out"
     # 默认要用批量测试模式
-    args="$args ARCH=$ARCH APP_FEATURES=batch ACCEL=n"
+    args="$args ARCH=$ARCH APP_FEATURES=batch ACCEL=n NET=y BLK=y"
     rm -f "$actual"
 
     MSG=

tools/axlibc/Cargo.toml

@@ -22,7 +22,7 @@ crate-type = ["lib", "staticlib"]
 [features]
 default = []
 
-irq = ["axfeat/irq", "arch_boot/irq"]
+irq = ["arceos_posix_api/irq", "arch_boot/irq"]
 
 # Multicore
 smp = ["arceos_posix_api/smp", "arch_boot/smp"]
@@ -61,4 +61,4 @@ axerrno = { git = "https://github.com/Starry-OS/axerrno.git" }
 arch_boot = { git = "https://github.com/Starry-OS/arch_boot.git" }
 
 [build-dependencies]
-bindgen ={ version = "0.66" }
+bindgen ={ version = "0.69" }

tools/axlibc/src/setjmp.rs

@@ -163,9 +163,9 @@ pub unsafe extern "C" fn longjmp(_buf: *mut ctypes::__jmp_buf_tag, _val: c_int)
     core::arch::asm!(
         "mov rax,rsi
         test rax,rax
-        jnz 1f
+        jnz 2f
         inc rax
-    1:
+    2:
         mov rbx, [rdi]
         mov rbp, [rdi + 8]
         mov r12, [rdi + 16]