From 02bf6a9b47ed2fb9e1c29881c5d13c845917969d Mon Sep 17 00:00:00 2001 From: Shaowei Song Date: Mon, 8 Jul 2024 08:32:43 +0000 Subject: [PATCH] Bump version to 0.6.2 --- .github/workflows/benchmark_asterinas.yml | 2 +- .github/workflows/publish_api_docs.yml | 2 +- .github/workflows/publish_osdk.yml | 2 +- .github/workflows/publish_website.yml | 2 +- .github/workflows/push_git_tag.yml | 2 +- .github/workflows/test_asterinas.yml | 12 ++++++------ .github/workflows/test_asterinas_vsock.yml | 2 +- .github/workflows/test_osdk.yml | 8 ++++---- Cargo.lock | 2 +- README.md | 2 +- README_CN.md | 2 +- VERSION | 2 +- docs/src/kernel/README.md | 2 +- docs/src/kernel/intel_tdx.md | 2 +- osdk/Cargo.toml | 2 +- ostd/Cargo.toml | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/benchmark_asterinas.yml b/.github/workflows/benchmark_asterinas.yml index 9e983d6e8..8d36eef4f 100644 --- a/.github/workflows/benchmark_asterinas.yml +++ b/.github/workflows/benchmark_asterinas.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false timeout-minutes: 60 container: - image: asterinas/asterinas:0.6.1 + image: asterinas/asterinas:0.6.2 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_api_docs.yml b/.github/workflows/publish_api_docs.yml index 6288a5194..64c59ef4b 100644 --- a/.github/workflows/publish_api_docs.yml +++ b/.github/workflows/publish_api_docs.yml @@ -16,7 +16,7 @@ jobs: build_and_upload: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.6.1 + container: asterinas/asterinas:0.6.2 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/publish_osdk.yml b/.github/workflows/publish_osdk.yml index a14964f3a..62a5580b4 100644 --- a/.github/workflows/publish_osdk.yml +++ b/.github/workflows/publish_osdk.yml @@ -15,7 +15,7 @@ jobs: osdk-publish: runs-on: ubuntu-latest timeout-minutes: 10 - container: asterinas/asterinas:0.6.1 + container: asterinas/asterinas:0.6.2 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/publish_website.yml b/.github/workflows/publish_website.yml index 5b8ecfde5..e87be2ecb 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.1 + container: asterinas/asterinas:0.6.2 steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/push_git_tag.yml b/.github/workflows/push_git_tag.yml index a8fecc86f..630a33e42 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.1 + tag: v0.6.2 diff --git a/.github/workflows/test_asterinas.yml b/.github/workflows/test_asterinas.yml index 94fb8c24c..2360ea0a3 100644 --- a/.github/workflows/test_asterinas.yml +++ b/.github/workflows/test_asterinas.yml @@ -10,9 +10,9 @@ jobs: lint: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.6.1 + container: asterinas/asterinas:0.6.2 steps: - - run: echo "Running in asterinas/asterinas:0.6.1" + - run: echo "Running in asterinas/asterinas:0.6.2" - uses: actions/checkout@v4 @@ -23,9 +23,9 @@ jobs: unit-test: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.6.1 + container: asterinas/asterinas:0.6.2 steps: - - run: echo "Running in asterinas/asterinas:0.6.1" + - run: echo "Running in asterinas/asterinas:0.6.2" - uses: actions/checkout@v4 @@ -42,9 +42,9 @@ jobs: integration-test: runs-on: ubuntu-latest timeout-minutes: 30 - container: asterinas/asterinas:0.6.1 + container: asterinas/asterinas:0.6.2 steps: - - run: echo "Running in asterinas/asterinas:0.6.1" + - run: echo "Running in asterinas/asterinas:0.6.2" - uses: actions/checkout@v4 diff --git a/.github/workflows/test_asterinas_vsock.yml b/.github/workflows/test_asterinas_vsock.yml index 74efb0cf1..bcd765bf9 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.1 \ + -v ./:/root/asterinas asterinas/asterinas:0.6.2 \ 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 dad438e21..e91eefc89 100644 --- a/.github/workflows/test_osdk.yml +++ b/.github/workflows/test_osdk.yml @@ -17,9 +17,9 @@ jobs: timeout-minutes: 30 strategy: matrix: - # asterinas/asterinas:0.6.1 container is the developing container of asterinas, - # asterinas/osdk:0.6.1 container is built with the intructions from Asterinas Book - container: ['asterinas/asterinas:0.6.1', 'asterinas/osdk:0.6.1'] + # 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'] container: ${{ matrix.container }} steps: - run: echo "Running in ${{ matrix.container }}" @@ -28,7 +28,7 @@ jobs: - name: Lint id: lint - if: matrix.container == 'asterinas/asterinas:0.6.1' + if: matrix.container == 'asterinas/asterinas:0.6.2' run: make check_osdk # Github's actions/checkout@v4 will result in a new user (not root) diff --git a/Cargo.lock b/Cargo.lock index 2593d9581..1eb7d1bcc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1071,7 +1071,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ostd" -version = "0.6.1" +version = "0.6.2" dependencies = [ "acpi", "align_ext", diff --git a/README.md b/README.md index 4d60d0ba4..f01119817 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.1 +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2 ``` 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 f751a679c..c3a762199 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.1 +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2 ``` 3. 在容器内，进入项目文件夹构建并运行星绽。 diff --git a/VERSION b/VERSION index 7ceb04048..b1d7abc0d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.1 \ No newline at end of file +0.6.2 \ No newline at end of file diff --git a/docs/src/kernel/README.md b/docs/src/kernel/README.md index 4e95558c4..627867b4e 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.1 +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2 ``` 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 8ee6fadc1..ced02d55f 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.1_tdx +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.6.2_tdx ``` 3. Inside the container, diff --git a/osdk/Cargo.toml b/osdk/Cargo.toml index 1fe292fa9..ba72b3587 100644 --- a/osdk/Cargo.toml +++ b/osdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-osdk" -version = "0.6.1" +version = "0.6.2" edition = "2021" description = "Accelerate OS development with Asterinas OSDK" license = "MPL-2.0" diff --git a/ostd/Cargo.toml b/ostd/Cargo.toml index 16725c8ba..625eefa2a 100644 --- a/ostd/Cargo.toml +++ b/ostd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ostd" -version = "0.6.1" +version = "0.6.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html