diff --git a/.github/workflows/benchmark_asterinas.yml b/.github/workflows/benchmark_asterinas.yml index 8616c409..cfb6c0f7 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.5.1 + image: asterinas/asterinas:0.6.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_api_docs.yml b/.github/workflows/publish_api_docs.yml index 9a3bf3e3..c14baca2 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.5.1 + container: asterinas/asterinas:0.6.0 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/publish_osdk.yml b/.github/workflows/publish_osdk.yml index 0c45edce..12b3c92f 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.5.1 + container: asterinas/asterinas:0.6.0 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/publish_website.yml b/.github/workflows/publish_website.yml index 3d1cdbc8..8a7cac05 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.5.1 + container: asterinas/asterinas:0.6.0 steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/push_git_tag.yml b/.github/workflows/push_git_tag.yml index 5b3899fb..542a9084 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.5.1 + tag: v0.6.0 diff --git a/.github/workflows/test_asterinas.yml b/.github/workflows/test_asterinas.yml index ed7512b2..7dd78179 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.5.1 + container: asterinas/asterinas:0.6.0 steps: - - run: echo "Running in asterinas/asterinas:0.5.1" + - run: echo "Running in asterinas/asterinas:0.6.0" - uses: actions/checkout@v4 @@ -23,9 +23,9 @@ jobs: unit-test: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.5.1 + container: asterinas/asterinas:0.6.0 steps: - - run: echo "Running in asterinas/asterinas:0.5.1" + - run: echo "Running in asterinas/asterinas:0.6.0" - uses: actions/checkout@v4 @@ -42,9 +42,9 @@ jobs: integration-test: runs-on: ubuntu-latest timeout-minutes: 30 - container: asterinas/asterinas:0.5.1 + container: asterinas/asterinas:0.6.0 steps: - - run: echo "Running in asterinas/asterinas:0.5.1" + - run: echo "Running in asterinas/asterinas:0.6.0" - uses: actions/checkout@v4 diff --git a/.github/workflows/test_asterinas_vsock.yml b/.github/workflows/test_asterinas_vsock.yml index 270c500b..62b2f9c0 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.5.1 \ + -v ./:/root/asterinas asterinas/asterinas:0.6.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 4759eccd..15570d4b 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.5.1 container is the developing container of asterinas, - # asterinas/osdk:0.5.1 container is built with the intructions from Asterinas Book - container: ['asterinas/asterinas:0.5.1', 'asterinas/osdk:0.5.1'] + # asterinas/asterinas:0.6.0 container is the developing container of asterinas, + # asterinas/osdk:0.6.0 container is built with the intructions from Asterinas Book + container: ['asterinas/asterinas:0.6.0', 'asterinas/osdk:0.6.0'] 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.5.1' + if: matrix.container == 'asterinas/asterinas:0.6.0' run: make check_osdk # Github's actions/checkout@v4 will result in a new user (not root) diff --git a/README.md b/README.md index b6ed82e7..ea9067f6 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 ./asterinas:/root/asterinas asterinas/asterinas:0.5.1 +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.6.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 085a340c..5524b057 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 ./asterinas:/root/asterinas asterinas/asterinas:0.5.1 +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.6.0 ``` 3. 在容器内,进入项目文件夹构建并运行星绽。 diff --git a/VERSION b/VERSION index 5d4294b9..09a3acfa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.1 \ No newline at end of file +0.6.0 \ No newline at end of file diff --git a/docs/src/kernel/README.md b/docs/src/kernel/README.md index a9a9c4ac..4072ae7b 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 asterinas:/root/asterinas asterinas/asterinas:0.5.1 +docker run -it --privileged --network=host --device=/dev/kvm -v asterinas:/root/asterinas asterinas/asterinas:0.6.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 2c740437..3bc96aea 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 ./asterinas:/root/asterinas asterinas/asterinas:0.5.1_tdx +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.6.0_tdx ``` 3. Inside the container, diff --git a/osdk/Cargo.toml b/osdk/Cargo.toml index b63429cf..90911afa 100644 --- a/osdk/Cargo.toml +++ b/osdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-osdk" -version = "0.5.1" +version = "0.6.0" edition = "2021" description = "Accelerate OS development with Asterinas OSDK" license = "MPL-2.0" diff --git a/tools/bump_version.sh b/tools/bump_version.sh index 887421b0..fe1ad9ee 100755 --- a/tools/bump_version.sh +++ b/tools/bump_version.sh @@ -96,7 +96,7 @@ update_tag_version() { SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) ASTER_SRC_DIR=${SCRIPT_DIR}/.. DOCS_DIR=${ASTER_SRC_DIR}/docs -CARGO_TOML_PATH=${ASTER_SRC_DIR}/Cargo.toml +OSTD_CARGO_TOML_PATH=${ASTER_SRC_DIR}/Cargo.toml OSDK_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/Cargo.toml VERSION_PATH=${ASTER_SRC_DIR}/VERSION @@ -112,7 +112,7 @@ validate_bump_type new_version=$(bump_version ${current_version}) # Update the package version in Cargo.toml -update_package_version ${CARGO_TOML_PATH} +update_package_version ${OSTD_CARGO_TOML_PATH} update_package_version ${OSDK_CARGO_TOML_PATH} # Automatically bump Cargo.lock file @@ -131,7 +131,7 @@ for workflow in $WORKFLOWS; do done # Update tag version in release_tag workflow -RELEASE_TAG_WORKFLOW=${ASTER_SRC_DIR}/.github/workflows/release_tag.yml +RELEASE_TAG_WORKFLOW=${ASTER_SRC_DIR}/.github/workflows/push_git_tag.yml update_tag_version $RELEASE_TAG_WORKFLOW # Update Docker image versions in the documentation