diff --git a/.github/workflows/benchmark_asterinas.yml b/.github/workflows/benchmark_asterinas.yml index 667ccf78..5042dbab 100644 --- a/.github/workflows/benchmark_asterinas.yml +++ b/.github/workflows/benchmark_asterinas.yml @@ -54,7 +54,7 @@ jobs: fail-fast: false timeout-minutes: 60 container: - image: asterinas/asterinas:0.6.2 + image: asterinas/asterinas:0.7.0 options: --device=/dev/kvm env: # Need to set up proxy since the self-hosted CI server is located in China, diff --git a/.github/workflows/publish_osdk_and_ostd.yml b/.github/workflows/publish_osdk_and_ostd.yml index c9e4d2e5..a6f2dcdc 100644 --- a/.github/workflows/publish_osdk_and_ostd.yml +++ b/.github/workflows/publish_osdk_and_ostd.yml @@ -16,7 +16,7 @@ jobs: osdk-publish: runs-on: ubuntu-latest timeout-minutes: 10 - container: asterinas/asterinas:0.6.2 + container: asterinas/asterinas:0.7.0 steps: - uses: actions/checkout@v4 @@ -39,7 +39,7 @@ jobs: ostd-publish: runs-on: ubuntu-latest timeout-minutes: 10 - container: asterinas/asterinas:0.6.2 + container: asterinas/asterinas:0.7.0 strategy: matrix: # All supported targets, this array should keep consistent with diff --git a/.github/workflows/publish_website.yml b/.github/workflows/publish_website.yml index e87be2ec..d89b5ebb 100644 --- a/.github/workflows/publish_website.yml +++ b/.github/workflows/publish_website.yml @@ -16,7 +16,7 @@ jobs: build_and_deploy: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.6.2 + container: asterinas/asterinas:0.7.0 steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/push_git_tag.yml b/.github/workflows/push_git_tag.yml index 630a33e4..edf500ce 100644 --- a/.github/workflows/push_git_tag.yml +++ b/.github/workflows/push_git_tag.yml @@ -17,4 +17,4 @@ jobs: uses: pxpm/github-tag-action@1.0.1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - tag: v0.6.2 + tag: v0.7.0 diff --git a/.github/workflows/test_asterinas.yml b/.github/workflows/test_asterinas.yml index 33b54078..5e299f64 100644 --- a/.github/workflows/test_asterinas.yml +++ b/.github/workflows/test_asterinas.yml @@ -14,9 +14,9 @@ jobs: if: github.event_name == 'push' || github.event_name == 'pull_request' runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.6.2 + container: asterinas/asterinas:0.7.0 steps: - - run: echo "Running in asterinas/asterinas:0.6.2" + - run: echo "Running in asterinas/asterinas:0.7.0" - uses: actions/checkout@v4 @@ -28,9 +28,9 @@ jobs: if: github.event_name == 'push' || github.event_name == 'pull_request' runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.6.2 + container: asterinas/asterinas:0.7.0 steps: - - run: echo "Running in asterinas/asterinas:0.6.2" + - run: echo "Running in asterinas/asterinas:0.7.0" - uses: actions/checkout@v4 @@ -49,10 +49,10 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 container: - image: asterinas/asterinas:0.6.2 + image: asterinas/asterinas:0.7.0 options: --device=/dev/kvm steps: - - run: echo "Running in asterinas/asterinas:0.6.2" + - run: echo "Running in asterinas/asterinas:0.7.0" - uses: actions/checkout@v4 @@ -88,7 +88,7 @@ jobs: runs-on: self-hosted timeout-minutes: 30 container: - image: asterinas/asterinas:0.6.2-tdx + image: asterinas/asterinas:0.7.0-tdx options: --device=/dev/kvm --privileged env: # Need to set up proxy since the self-hosted CI server is located in China, @@ -96,7 +96,7 @@ jobs: RUSTUP_DIST_SERVER: https://mirrors.ustc.edu.cn/rust-static RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup steps: - - run: echo "Running in asterinas/asterinas:0.6.2-tdx" + - run: echo "Running in asterinas/asterinas:0.7.0-tdx" - uses: actions/checkout@v4 - name: Set up the environment run: | diff --git a/.github/workflows/test_asterinas_vsock.yml b/.github/workflows/test_asterinas_vsock.yml index bcd765bf..97b1a83d 100644 --- a/.github/workflows/test_asterinas_vsock.yml +++ b/.github/workflows/test_asterinas_vsock.yml @@ -23,7 +23,7 @@ jobs: run: | docker run \ --privileged --network=host --device=/dev/kvm \ - -v ./:/root/asterinas asterinas/asterinas:0.6.2 \ + -v ./:/root/asterinas asterinas/asterinas:0.7.0 \ make run AUTO_TEST=vsock ENABLE_KVM=0 SCHEME=microvm RELEASE_MODE=1 & - name: Run Vsock Client on Host id: host_vsock_client diff --git a/.github/workflows/test_osdk.yml b/.github/workflows/test_osdk.yml index 5001b0ab..e07e5335 100644 --- a/.github/workflows/test_osdk.yml +++ b/.github/workflows/test_osdk.yml @@ -21,9 +21,9 @@ jobs: timeout-minutes: 30 strategy: matrix: - # asterinas/asterinas:0.6.2 container is the developing container of asterinas, - # asterinas/osdk:0.6.2 container is built with the intructions from Asterinas Book - container: ['asterinas/asterinas:0.6.2', 'asterinas/osdk:0.6.2'] + # asterinas/asterinas:0.7.0 container is the developing container of asterinas, + # asterinas/osdk:0.7.0 container is built with the intructions from Asterinas Book + container: ['asterinas/asterinas:0.7.0', 'asterinas/osdk:0.7.0'] container: ${{ matrix.container }} steps: - run: echo "Running in ${{ matrix.container }}" @@ -32,7 +32,7 @@ jobs: - name: Lint id: lint - if: matrix.container == 'asterinas/asterinas:0.6.2' + if: matrix.container == 'asterinas/asterinas:0.7.0' run: make check_osdk # Github's actions/checkout@v4 will result in a new user (not root) @@ -56,9 +56,9 @@ jobs: RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup strategy: matrix: - # asterinas/asterinas:0.6.2-tdx container is the developing container of asterinas, - # asterinas/osdk:0.6.2-tdx container is built with the intructions from Asterinas Book - container: ['asterinas/asterinas:0.6.2-tdx', 'asterinas/osdk:0.6.2-tdx'] + # asterinas/asterinas:0.7.0-tdx container is the developing container of asterinas, + # asterinas/osdk:0.7.0-tdx container is built with the intructions from Asterinas Book + container: ['asterinas/asterinas:0.7.0-tdx', 'asterinas/osdk:0.7.0-tdx'] container: image: ${{ matrix.container }} options: --device=/dev/kvm --privileged @@ -67,7 +67,7 @@ jobs: - uses: actions/checkout@v4 - name: Lint id: lint - if: matrix.container == 'asterinas/asterinas:0.6.2-tdx' + if: matrix.container == 'asterinas/asterinas:0.7.0-tdx' run: make check_osdk # Github's actions/checkout@v4 will result in a new user (not root) # and thus not using the Rust environment we set up in the container. diff --git a/Cargo.lock b/Cargo.lock index 7f59ad4e..603f3b4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1065,7 +1065,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ostd" -version = "0.6.2" +version = "0.7.0" dependencies = [ "acpi", "align_ext", diff --git a/README.md b/README.md index f0111981..26832d32 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ git clone https://github.com/asterinas/asterinas 2. Run a Docker container as the development environment. ```bash -docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2 +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.7.0 ``` 3. Inside the container, go to the project folder to build and run Asterinas. diff --git a/README_CN.md b/README_CN.md index c3a76219..d825b72a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -49,7 +49,7 @@ git clone https://github.com/asterinas/asterinas 2. 运行一个作为开发环境的Docker容器。 ```bash -docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2 +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.7.0 ``` 3. 在容器内,进入项目文件夹构建并运行星绽。 diff --git a/VERSION b/VERSION index b1d7abc0..bcaffe19 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.2 \ No newline at end of file +0.7.0 \ No newline at end of file diff --git a/docs/src/kernel/README.md b/docs/src/kernel/README.md index 627867b4..da180fe1 100644 --- a/docs/src/kernel/README.md +++ b/docs/src/kernel/README.md @@ -44,7 +44,7 @@ git clone https://github.com/asterinas/asterinas 2. Run a Docker container as the development environment. ```bash -docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2 +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.7.0 ``` 3. Inside the container, go to the project folder to build and run Asterinas. diff --git a/docs/src/kernel/intel_tdx.md b/docs/src/kernel/intel_tdx.md index 3eea3c05..294caedc 100644 --- a/docs/src/kernel/intel_tdx.md +++ b/docs/src/kernel/intel_tdx.md @@ -66,7 +66,7 @@ git clone https://github.com/asterinas/asterinas 2. Run a Docker container as the development environment. ```bash -docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2-tdx +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.7.0-tdx ``` 3. Inside the container, diff --git a/osdk/Cargo.toml b/osdk/Cargo.toml index a5366aa8..7fbcb3ab 100644 --- a/osdk/Cargo.toml +++ b/osdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-osdk" -version = "0.6.2" +version = "0.7.0" edition = "2021" description = "Accelerate OS development with Asterinas OSDK" license = "MPL-2.0" diff --git a/ostd/Cargo.toml b/ostd/Cargo.toml index e190e7a0..c1d357cf 100644 --- a/ostd/Cargo.toml +++ b/ostd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ostd" -version = "0.6.2" +version = "0.7.0" edition = "2021" description = "Rust OS framework that facilitates the development of and innovation in OS kernels" license = "MPL-2.0" diff --git a/tools/docker/Dockerfile.jinja b/tools/docker/Dockerfile.jinja index 5df2fd41..4f837343 100644 --- a/tools/docker/Dockerfile.jinja +++ b/tools/docker/Dockerfile.jinja @@ -264,7 +264,8 @@ RUN curl https://sh.rustup.rs -sSf | \ # Install cargo tools RUN cargo install \ cargo-binutils \ - mdbook + mdbook \ + typos-cli FROM rust