Merge pull request syswonder#39 from syswonder/dev

 Merge dev into main

.github/workflows/build.yml

@@ -47,36 +47,12 @@ jobs:
         crate: cargo-binutils
         version: latest
         use-tool-cache: true
-    - name: Build helloworld
-      run: make ARCH=${{ matrix.arch }} A=apps/helloworld
-    - name: Build memtest
-      run: make ARCH=${{ matrix.arch }} A=apps/memtest
-    - name: Build exception
-      run: make ARCH=${{ matrix.arch }} A=apps/exception
     - name: Build display/basic_painting
       run: make ARCH=${{ matrix.arch }} A=apps/display/basic_painting
     - name: Build display/draw_map
       run: make ARCH=${{ matrix.arch }} A=apps/display/draw_map
-    - name: Build task/yield
-      run: make ARCH=${{ matrix.arch }} A=apps/task/yield
-    - name: Build task/parallel
-      run: make ARCH=${{ matrix.arch }} A=apps/task/parallel
-    - name: Build task/sleep
-      run: make ARCH=${{ matrix.arch }} A=apps/task/sleep
-    - name: Build task/priority
-      run: make ARCH=${{ matrix.arch }} A=apps/task/priority
-    - name: Build task/tls
-      run: make ARCH=${{ matrix.arch }} A=apps/task/tls
     - name: Build fs/shell
       run: make ARCH=${{ matrix.arch }} A=apps/fs/shell
-    - name: Build net/echoserver
-      run: make ARCH=${{ matrix.arch }} A=apps/net/echoserver
-    - name: Build net/httpclient
-      run: make ARCH=${{ matrix.arch }} A=apps/net/httpclient
-    - name: Build net/httpserver
-      run: make ARCH=${{ matrix.arch }} A=apps/net/httpserver
-    - name: Build net/udpserver
-      run: make ARCH=${{ matrix.arch }} A=apps/net/udpserver
 
     - uses: ./.github/workflows/actions/setup-musl
       with:
@@ -98,45 +74,6 @@ jobs:
     - name: Build c/redis
       run: make ARCH=${{ matrix.arch }} A=apps/c/redis SMP=4
 
-  build-apps-for-other-platforms:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: ${{ env.rust-toolchain }}
-        components: rust-src
-    - uses: actions-rs/[email protected]
-      with:
-        crate: cargo-binutils
-        version: latest
-        use-tool-cache: true
-    - uses: ./.github/workflows/actions/setup-musl
-      with:
-        arch: x86_64
-
-    - name: Build helloworld for x86_64-pc-oslab
-      run: make PLATFORM=x86_64-pc-oslab A=apps/helloworld
-    - 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
-    - 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
-
-    - name: Build helloworld for aarch64-raspi4
-      run: make PLATFORM=aarch64-raspi4 A=apps/helloworld
-    - name: Build fs/shell for aarch64-raspi4
-      run: make PLATFORM=aarch64-raspi4 A=apps/fs/shell FEATURES=driver-bcm2835-sdhci
-
-    - name: Build helloworld for aarch64-bsta1000b
-      run: make PLATFORM=aarch64-bsta1000b A=apps/helloworld
-
   build-apps-for-std:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -150,29 +87,5 @@ jobs:
       with:
         profile: minimal
         toolchain: ${{ env.rust-toolchain }}
-    - name: Build helloworld
-      run: cargo build -p arceos-helloworld
-    - name: Build memtest
-      run: cargo build -p arceos-memtest
-    - name: Build exception
-      run: cargo build -p arceos-exception
-    - name: Build task/yield
-      run: cargo build -p arceos-yield
-    - name: Build task/parallel
-      run: cargo build -p arceos-parallel
-    - name: Build task/sleep
-      run: cargo build -p arceos-sleep
-    - name: Build task/priority
-      run: cargo build -p arceos-priority
-    - name: Build task/tls
-      run: cargo build -p arceos-tls
     - name: Build fs/shell
       run: cargo build -p arceos-shell
-    - name: Build net/echoserver
-      run: cargo build -p arceos-echoserver
-    - name: Build net/httpclient
-      run: cargo build -p arceos-httpclient
-    - name: Build net/httpserver
-      run: cargo build -p arceos-httpserver
-    - name: Build net/udpserver
-      run: cargo build -p arceos-udpserver

.github/workflows/docs.yml

@@ -23,10 +23,3 @@ jobs:
     - name: Build docs
       continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
       run: make doc_check_missing
-    - name: Deploy to Github Pages
-      if: ${{ github.ref == env.default-branch }}
-      uses: JamesIves/github-pages-deploy-action@v4
-      with:
-        single-commit: true
-        branch: gh-pages
-        folder: target/doc

.gitignore

@@ -2,7 +2,7 @@
 /.vscode
 .DS_Store
 *.asm
-*.img
+disk.img
 actual.out
 qemu.log
 rusty-tags.vi