Merge branch 'main' of https://github.com/arceos-org/arceos into arceos-main

Author: lvyuemeng

.github/workflows/actions/setup-musl/action.yml

@@ -21,6 +21,7 @@ jobs:
         targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
     - uses: Swatinem/rust-cache@v2
       with:
+        shared-key: cargo-bin-cache
         cache-targets: false
     - name: Check rust version
       run: rustc --version --verbose
@@ -37,11 +38,10 @@ 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]
     env:
@@ -55,8 +55,8 @@ jobs:
         targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
     - uses: Swatinem/rust-cache@v2
       with:
+        shared-key: cargo-bin-cache
         cache-targets: false
-    - run: cargo install cargo-binutils
     - name: Build helloworld
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: make ARCH=${{ matrix.arch }} A=examples/helloworld
@@ -70,7 +70,7 @@ jobs:
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: make ARCH=${{ matrix.arch }} A=examples/shell
 
-    - uses: ./.github/workflows/actions/setup-musl
+    - uses: arceos-org/setup-musl@v1
       with:
         arch: ${{ matrix.arch }}
     - name: Build helloworld-c
@@ -84,12 +84,13 @@ jobs:
       run: make ARCH=${{ matrix.arch }} A=examples/httpserver-c
 
   build-for-other-platforms:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
         rust-toolchain: [nightly, nightly-2025-05-20]
+    env:
+      RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
@@ -99,50 +100,179 @@ jobs:
         targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat, loongarch64-unknown-none-softfloat
     - uses: Swatinem/rust-cache@v2
       with:
+        shared-key: cargo-bin-cache
         cache-targets: false
-    - run: cargo install cargo-binutils
+
+    # Test various config files
     - name: Build helloworld for x86_64-pc-oslab
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=x86_64-pc-oslab A=examples/helloworld
+      run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml A=examples/helloworld
     - name: Build httpclient for x86_64-pc-oslab
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=x86_64-pc-oslab A=examples/httpclient FEATURES=page-alloc-4g,driver-ixgbe
+      run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml A=examples/httpclient FEATURES=page-alloc-4g,driver-ixgbe
     - name: Build httpserver for x86_64-pc-oslab
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=x86_64-pc-oslab A=examples/httpserver FEATURES=page-alloc-4g,driver-ixgbe
+      run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml A=examples/httpserver FEATURES=page-alloc-4g,driver-ixgbe
     - name: Build shell for x86_64-pc-oslab
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=x86_64-pc-oslab A=examples/shell FEATURES=page-alloc-4g,driver-ramdisk
+      run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml A=examples/shell FEATURES=page-alloc-4g,driver-ramdisk
 
-    - run: make PLATFORM=aarch64-raspi4 defconfig
+    # Test app `helloworld-myplat` for various platforms
+    - name: Build helloworld-myplat for x86-pc
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        make ARCH=x86_64 defconfig
+        make ARCH=x86_64 A=examples/helloworld-myplat SMP=4 APP_FEATURES=x86-pc
+        make MYPLAT=axplat-x86-pc A=examples/helloworld-myplat SMP=4 APP_FEATURES=x86-pc
+    - name: Build helloworld-myplat for aarch64-qemu-virt
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        make ARCH=aarch64 defconfig
+        make ARCH=aarch64 A=examples/helloworld-myplat SMP=4 APP_FEATURES=aarch64-qemu-virt
+        make MYPLAT=axplat-aarch64-qemu-virt A=examples/helloworld-myplat SMP=4 APP_FEATURES=aarch64-qemu-virt
+    - name: Build helloworld-myplat for aarch64-raspi4
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        make MYPLAT=axplat-aarch64-raspi defconfig
+        make MYPLAT=axplat-aarch64-raspi A=examples/helloworld-myplat APP_FEATURES=aarch64-raspi4
+    - name: Build helloworld-myplat for aarch64-bsta1000b
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        make MYPLAT=axplat-aarch64-bsta1000b defconfig
+        make MYPLAT=axplat-aarch64-bsta1000b A=examples/helloworld-myplat APP_FEATURES=aarch64-bsta1000b
+      
+    - name: Build helloworld-myplat for aarch64-phytium-pi
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        make MYPLAT=axplat-aarch64-phytium-pi defconfig
+        make MYPLAT=axplat-aarch64-phytium-pi A=examples/helloworld-myplat APP_FEATURES=aarch64-phytium-pi
+
+    - name: Build helloworld-myplat for loongarch64-qemu-virt
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        make ARCH=loongarch64 defconfig
+        make ARCH=loongarch64 A=examples/helloworld-myplat SMP=4 APP_FEATURES=loongarch64-qemu-virt
+        make MYPLAT=axplat-loongarch64-qemu-virt A=examples/helloworld-myplat SMP=4 APP_FEATURES=loongarch64-qemu-virt
+      
+    - name: Build helloworld-myplat for riscv64-qemu-virt
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        make ARCH=riscv64 defconfig
+        make ARCH=riscv64 A=examples/helloworld-myplat SMP=4 APP_FEATURES=riscv64-qemu-virt
+        make MYPLAT=axplat-riscv64-qemu-virt A=examples/helloworld-myplat SMP=4 APP_FEATURES=riscv64-qemu-virt
+      
+
+    # Test platform `aarch64-raspi4` for various apps
+    - name: Setup aarch64-raspi4
+      run: |
+        git checkout .
+        make MYPLAT=axplat-aarch64-raspi defconfig
+        cargo axplat add axplat-aarch64-raspi -p arceos-helloworld -F smp --git https://github.com/arceos-org/axhal_crates.git
+        cargo axplat add axplat-aarch64-raspi -p arceos-shell -F smp --git https://github.com/arceos-org/axhal_crates.git
+        echo "extern crate axplat_aarch64_raspi;" >> examples/helloworld/src/main.rs
+        echo "extern crate axplat_aarch64_raspi;" >> examples/shell/src/main.rs
     - name: Build helloworld for aarch64-raspi4
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=aarch64-raspi4 SMP=4 A=examples/helloworld
+      run: make MYPLAT=axplat-aarch64-raspi A=examples/helloworld
     - name: Build shell for aarch64-raspi4
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=aarch64-raspi4 SMP=4 A=examples/shell FEATURES=page-alloc-4g,driver-bcm2835-sdhci BUS=mmio
+      run: make MYPLAT=axplat-aarch64-raspi A=examples/shell FEATURES=page-alloc-4g,driver-bcm2835-sdhci BUS=mmio
 
-    - run: make PLATFORM=aarch64-bsta1000b defconfig
+    # Test platform `aarch64-bsta1000b` for various apps
+    - name: Setup aarch64-bsta1000b
+      run: |
+        git checkout .
+        make MYPLAT=axplat-aarch64-bsta1000b defconfig
+        cargo axplat add axplat-aarch64-bsta1000b -p arceos-helloworld -F smp --git https://github.com/arceos-org/axhal_crates.git
+        cargo axplat add axplat-aarch64-bsta1000b -p arceos-shell -F smp --git https://github.com/arceos-org/axhal_crates.git
+        echo "extern crate axplat_aarch64_bsta1000b;" >> examples/helloworld/src/main.rs
+        echo "extern crate axplat_aarch64_bsta1000b;" >> examples/shell/src/main.rs
     - name: Build helloworld for aarch64-bsta1000b
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=aarch64-bsta1000b A=examples/helloworld SMP=8
+      run: make MYPLAT=axplat-aarch64-bsta1000b A=examples/helloworld
+    - name: Build shell for aarch64-bsta1000b
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: make MYPLAT=axplat-aarch64-bsta1000b A=examples/shell FEATURES=page-alloc-4g,driver-ramdisk BUS=mmio
 
-    - run: make PLATFORM=aarch64-phytium-pi defconfig
+    # Test platform `aarch64-phytium-pi` for various apps
+    - name: Setup aarch64-phytium-pi
+      run: |
+        git checkout .
+        make MYPLAT=axplat-aarch64-phytium-pi defconfig
+        cargo axplat add axplat-aarch64-phytium-pi -p arceos-helloworld -F smp --git https://github.com/arceos-org/axhal_crates.git
+        cargo axplat add axplat-aarch64-phytium-pi -p arceos-shell -F smp --git https://github.com/arceos-org/axhal_crates.git
+        echo "extern crate axplat_aarch64_phytium_pi;" >> examples/helloworld/src/main.rs
+        echo "extern crate axplat_aarch64_phytium_pi;" >> examples/shell/src/main.rs
     - name: Build helloworld for aarch64-phytium-pi
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=aarch64-phytium-pi A=examples/helloworld SMP=4
+      run: make MYPLAT=axplat-aarch64-phytium-pi A=examples/helloworld
+    - name: Build shell for aarch64-phytium-pi
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: make MYPLAT=axplat-aarch64-phytium-pi A=examples/shell FEATURES=page-alloc-4g,driver-ramdisk BUS=mmio
 
-    - uses: ./.github/workflows/actions/setup-musl
+    # Test various config files for C apps
+    - uses: arceos-org/setup-musl@v1
       with:
         arch: x86_64
-    - run: make PLATFORM=x86_64-pc-oslab defconfig
+    - name: Setup x86_64-pc-oslab for C apps
+      run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml defconfig
     - name: Build helloworld-c for x86_64-pc-oslab
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=x86_64-pc-oslab A=examples/helloworld-c
+      run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml A=examples/helloworld-c
     - name: Build httpclient-c for x86_64-pc-oslab
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=x86_64-pc-oslab A=examples/httpclient-c FEATURES=page-alloc-4g,driver-ixgbe
+      run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml A=examples/httpclient-c FEATURES=page-alloc-4g,driver-ixgbe
     - name: Build httpserver-c for x86_64-pc-oslab
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make PLATFORM=x86_64-pc-oslab A=examples/httpserver-c FEATURES=page-alloc-4g,driver-ixgbe
+      run: make PLAT_CONFIG=$(pwd)/configs/custom/x86_64-pc-oslab.toml A=examples/httpserver-c FEATURES=page-alloc-4g,driver-ixgbe
 
+  # Necessary checks for macOS builds
+  build-for-macos:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rust-toolchain: [nightly, nightly-2025-05-20]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: ${{ matrix.rust-toolchain }}
+        components: rust-src, clippy
+        targets: x86_64-unknown-none
+    - uses: Swatinem/rust-cache@v2
+      with:
+        shared-key: cargo-bin-cache
+        cache-targets: false
+    - name: Clippy for the default target
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: make clippy
+
+    - run: cargo install cargo-binutils
+    - name: Build helloworld
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: make A=examples/helloworld
+
+    # Test for other platforms
+    - run: make PLATFORM=x86_64-pc-oslab defconfig
+    - name: Build helloworld for x86_64-pc-oslab
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: make PLATFORM=x86_64-pc-oslab A=examples/helloworld
+    - name: Build shell for x86_64-pc-oslab
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: make PLATFORM=x86_64-pc-oslab A=examples/shell FEATURES=page-alloc-4g,driver-ramdisk
+
+    - run: make PLATFORM=aarch64-raspi4 defconfig
+    - name: Build helloworld for aarch64-raspi4
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: make PLATFORM=aarch64-raspi4 SMP=4 A=examples/helloworld
+
+    - run: make PLATFORM=aarch64-bsta1000b defconfig
+    - name: Build helloworld for aarch64-bsta1000b
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: make PLATFORM=aarch64-bsta1000b A=examples/helloworld SMP=8
+
+    - run: make PLATFORM=aarch64-phytium-pi defconfig
+    - name: Build helloworld for aarch64-phytium-pi
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: make PLATFORM=aarch64-phytium-pi A=examples/helloworld SMP=4

.github/workflows/actions/setup-qemu/action.yml

@@ -7,8 +7,10 @@ env:
 
 jobs:
   doc:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
       fail-fast: false
     permissions:
       contents: write
@@ -21,12 +23,12 @@ jobs:
         toolchain: ${{ env.rust-toolchain }}
     - uses: Swatinem/rust-cache@v2
       with:
+        shared-key: cargo-bin-cache
         cache-targets: false
     - name: Build docs
-      continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
-      run: make doc_check_missing
+      run: make doc_check_missing ARCH=${{ matrix.os == 'macos-latest' && 'aarch64' || 'x86_64' }}
     - name: Deploy to Github Pages
-      if: ${{ github.ref == env.default-branch }}
+      if: ${{ github.ref == env.default-branch && matrix.os == 'ubuntu-latest' }}
       uses: JamesIves/github-pages-deploy-action@v4
       with:
         single-commit: true