From fbb8ea6ad1963c3b548553255d85c21910469b9c Mon Sep 17 00:00:00 2001 From: Zhang Junyang Date: Fri, 14 Mar 2025 20:02:41 +0800 Subject: [PATCH] Bump version to 0.13.0 --- .github/workflows/benchmark_asterinas.yml | 2 +- .github/workflows/publish_osdk_and_ostd.yml | 2 +- .github/workflows/publish_website.yml | 2 +- .github/workflows/push_git_tag.yml | 2 +- .github/workflows/test_asterinas.yml | 20 +++++++++---------- .github/workflows/test_asterinas_vsock.yml | 2 +- .github/workflows/test_osdk.yml | 16 +++++++-------- Cargo.lock | 18 ++++++++--------- README.md | 2 +- README_CN.md | 2 +- README_JP.md | 2 +- VERSION | 2 +- docs/src/kernel/README.md | 2 +- docs/src/kernel/intel_tdx.md | 2 +- osdk/Cargo.lock | 4 ++-- osdk/Cargo.toml | 4 ++-- osdk/deps/frame-allocator/Cargo.toml | 4 ++-- osdk/deps/heap-allocator/Cargo.toml | 4 ++-- osdk/deps/test-kernel/Cargo.toml | 4 ++-- ostd/Cargo.toml | 8 ++++---- .../libs/linux-bzimage/boot-params/Cargo.toml | 2 +- ostd/libs/linux-bzimage/builder/Cargo.toml | 2 +- ostd/libs/linux-bzimage/setup/Cargo.toml | 4 ++-- ostd/libs/ostd-macros/Cargo.toml | 2 +- ostd/libs/ostd-test/Cargo.toml | 2 +- 25 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/benchmark_asterinas.yml b/.github/workflows/benchmark_asterinas.yml index 929bad91..ba2cdb38 100644 --- a/.github/workflows/benchmark_asterinas.yml +++ b/.github/workflows/benchmark_asterinas.yml @@ -105,7 +105,7 @@ jobs: fail-fast: false timeout-minutes: 60 container: - image: asterinas/asterinas:0.12.0 + image: asterinas/asterinas:0.13.0 options: --device=/dev/kvm --privileged 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 5d9dfbca..e45153ce 100644 --- a/.github/workflows/publish_osdk_and_ostd.yml +++ b/.github/workflows/publish_osdk_and_ostd.yml @@ -17,7 +17,7 @@ jobs: publish: runs-on: ubuntu-latest timeout-minutes: 10 - container: asterinas/asterinas:0.12.0 + container: asterinas/asterinas:0.13.0 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/publish_website.yml b/.github/workflows/publish_website.yml index 7a0d16c6..1453f450 100644 --- a/.github/workflows/publish_website.yml +++ b/.github/workflows/publish_website.yml @@ -17,7 +17,7 @@ jobs: build_and_deploy: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.12.0 + container: asterinas/asterinas:0.13.0 steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/push_git_tag.yml b/.github/workflows/push_git_tag.yml index 734984a8..a1b630b1 100644 --- a/.github/workflows/push_git_tag.yml +++ b/.github/workflows/push_git_tag.yml @@ -18,4 +18,4 @@ jobs: uses: pxpm/github-tag-action@1.0.1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - tag: v0.12.0 + tag: v0.13.0 diff --git a/.github/workflows/test_asterinas.yml b/.github/workflows/test_asterinas.yml index 13b6bef3..c8be174a 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.12.0 + container: asterinas/asterinas:0.13.0 steps: - - run: echo "Running in asterinas/asterinas:0.12.0" + - run: echo "Running in asterinas/asterinas:0.13.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.12.0 + container: asterinas/asterinas:0.13.0 steps: - - run: echo "Running in asterinas/asterinas:0.12.0" + - run: echo "Running in asterinas/asterinas:0.13.0" - uses: actions/checkout@v4 @@ -45,10 +45,10 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 container: - image: asterinas/asterinas:0.12.0 + image: asterinas/asterinas:0.13.0 options: --device=/dev/kvm --privileged steps: - - run: echo "Running in asterinas/asterinas:0.12.0" + - run: echo "Running in asterinas/asterinas:0.13.0" - uses: actions/checkout@v4 @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 container: - image: asterinas/asterinas:0.12.0 + image: asterinas/asterinas:0.13.0 options: --device=/dev/kvm --privileged strategy: matrix: @@ -85,7 +85,7 @@ jobs: fail-fast: false steps: - - run: echo "Running in asterinas/asterinas:0.12.0" + - run: echo "Running in asterinas/asterinas:0.13.0" - uses: actions/checkout@v4 @@ -142,7 +142,7 @@ jobs: runs-on: self-hosted timeout-minutes: 30 container: - image: asterinas/asterinas:0.12.0-tdx + image: asterinas/asterinas:0.13.0-tdx options: --device=/dev/kvm --privileged env: # Need to set up proxy since the self-hosted CI server is located in China, @@ -150,7 +150,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.12.0-tdx" + - run: echo "Running in asterinas/asterinas:0.13.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 16d91766..0a173983 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.12.0 \ + -v ./:/root/asterinas asterinas/asterinas:0.13.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 bb80d259..25bb8048 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.12.0 container is the developing container of asterinas, - # asterinas/osdk:0.12.0 container is built with the intructions from Asterinas Book - container: ['asterinas/asterinas:0.12.0', 'asterinas/osdk:0.12.0'] + # asterinas/asterinas:0.13.0 container is the developing container of asterinas, + # asterinas/osdk:0.13.0 container is built with the intructions from Asterinas Book + container: ['asterinas/asterinas:0.13.0', 'asterinas/osdk:0.13.0'] fail-fast: false container: ${{ matrix.container }} steps: @@ -33,7 +33,7 @@ jobs: - name: Lint id: lint - if: matrix.container == 'asterinas/asterinas:0.12.0' + if: matrix.container == 'asterinas/asterinas:0.13.0' run: make check_osdk # Github's actions/checkout@v4 will result in a new user (not root) @@ -54,9 +54,9 @@ jobs: RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup strategy: matrix: - # asterinas/asterinas:0.12.0-tdx container is the developing container of asterinas, - # asterinas/osdk:0.12.0-tdx container is built with the intructions from Asterinas Book - container: ['asterinas/asterinas:0.12.0-tdx', 'asterinas/osdk:0.12.0-tdx'] + # asterinas/asterinas:0.13.0-tdx container is the developing container of asterinas, + # asterinas/osdk:0.13.0-tdx container is built with the intructions from Asterinas Book + container: ['asterinas/asterinas:0.13.0-tdx', 'asterinas/osdk:0.13.0-tdx'] fail-fast: false container: image: ${{ matrix.container }} @@ -66,7 +66,7 @@ jobs: - uses: actions/checkout@v4 - name: Lint id: lint - if: matrix.container == 'asterinas/asterinas:0.12.0-tdx' + if: matrix.container == 'asterinas/asterinas:0.13.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 01ac79f9..fad05662 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1022,11 +1022,11 @@ dependencies = [ [[package]] name = "linux-boot-params" -version = "0.12.0" +version = "0.13.0" [[package]] name = "linux-bzimage-builder" -version = "0.12.0" +version = "0.13.0" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -1037,7 +1037,7 @@ dependencies = [ [[package]] name = "linux-bzimage-setup" -version = "0.12.0" +version = "0.13.0" dependencies = [ "cfg-if", "core2", @@ -1256,7 +1256,7 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "osdk-frame-allocator" -version = "0.12.0" +version = "0.13.0" dependencies = [ "log", "ostd", @@ -1264,7 +1264,7 @@ dependencies = [ [[package]] name = "osdk-heap-allocator" -version = "0.12.0" +version = "0.13.0" dependencies = [ "log", "ostd", @@ -1272,7 +1272,7 @@ dependencies = [ [[package]] name = "osdk-test-kernel" -version = "0.12.0" +version = "0.13.0" dependencies = [ "ostd", "owo-colors 4.1.0", @@ -1280,7 +1280,7 @@ dependencies = [ [[package]] name = "ostd" -version = "0.12.0" +version = "0.13.0" dependencies = [ "acpi", "align_ext", @@ -1318,7 +1318,7 @@ dependencies = [ [[package]] name = "ostd-macros" -version = "0.12.0" +version = "0.13.0" dependencies = [ "proc-macro2", "quote", @@ -1346,7 +1346,7 @@ dependencies = [ [[package]] name = "ostd-test" -version = "0.12.0" +version = "0.13.0" [[package]] name = "owo-colors" diff --git a/README.md b/README.md index 8af8e616..59d0a61d 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,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.12.0 +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.13.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 0efc970b..afdc4e3d 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.12.0 +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.13.0 ``` 3. 在容器内，进入项目文件夹构建并运行星绽。 diff --git a/README_JP.md b/README_JP.md index ced8c112..aa681348 100644 --- a/README_JP.md +++ b/README_JP.md @@ -45,7 +45,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.12.0 +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.13.0 ``` 3. コンテナ内でプロジェクトフォルダに移動し、Asterinasをビルドして実行します。 diff --git a/VERSION b/VERSION index d33c3a21..51de3305 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.12.0 \ No newline at end of file +0.13.0 \ No newline at end of file diff --git a/docs/src/kernel/README.md b/docs/src/kernel/README.md index f1200e5c..7680f1d4 100644 --- a/docs/src/kernel/README.md +++ b/docs/src/kernel/README.md @@ -48,7 +48,7 @@ docker run -it --privileged \ --network=host \ --device=/dev/kvm \ -v $(pwd)/asterinas:/root/asterinas \ - asterinas/asterinas:0.12.0 + asterinas/asterinas:0.13.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 ad268c78..86b8cfff 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.12.0-tdx +docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.13.0-tdx ``` 3. Inside the container, diff --git a/osdk/Cargo.lock b/osdk/Cargo.lock index 11ff968c..912fc960 100644 --- a/osdk/Cargo.lock +++ b/osdk/Cargo.lock @@ -177,7 +177,7 @@ dependencies = [ [[package]] name = "cargo-osdk" -version = "0.12.0" +version = "0.13.0" dependencies = [ "assert_cmd", "chrono", @@ -573,7 +573,7 @@ dependencies = [ [[package]] name = "linux-bzimage-builder" -version = "0.12.0" +version = "0.13.0" dependencies = [ "bitflags 1.3.2", "bytemuck", diff --git a/osdk/Cargo.toml b/osdk/Cargo.toml index 0eaff0f6..d2929470 100644 --- a/osdk/Cargo.toml +++ b/osdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-osdk" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "Accelerate OS development with Asterinas OSDK" license = "MPL-2.0" @@ -10,7 +10,7 @@ repository = "https://github.com/asterinas/asterinas" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -linux-bzimage-builder = { version = "0.12.0", path = "../ostd/libs/linux-bzimage/builder" } +linux-bzimage-builder = { version = "0.13.0", path = "../ostd/libs/linux-bzimage/builder" } clap = { version = "4.4.17", features = ["cargo", "derive"] } chrono = "0.4.38" env_logger = "0.11.0" diff --git a/osdk/deps/frame-allocator/Cargo.toml b/osdk/deps/frame-allocator/Cargo.toml index d4d28a0e..361341ea 100644 --- a/osdk/deps/frame-allocator/Cargo.toml +++ b/osdk/deps/frame-allocator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "osdk-frame-allocator" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "The default buddy system frame allocator shipped with OSDK." license = "MPL-2.0" @@ -9,7 +9,7 @@ readme = "README.md" [dependencies] log = "0.4" -ostd = { version = "0.12.0", path = "../../../ostd" } +ostd = { version = "0.13.0", path = "../../../ostd" } [lints] workspace = true diff --git a/osdk/deps/heap-allocator/Cargo.toml b/osdk/deps/heap-allocator/Cargo.toml index b8c6d151..772e2f27 100644 --- a/osdk/deps/heap-allocator/Cargo.toml +++ b/osdk/deps/heap-allocator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "osdk-heap-allocator" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "The default slab-based heap allocator shipped with OSDK." license = "MPL-2.0" @@ -9,7 +9,7 @@ readme = "README.md" [dependencies] log = "0.4" -ostd = { version = "0.12.0", path = "../../../ostd" } +ostd = { version = "0.13.0", path = "../../../ostd" } [lints] workspace = true diff --git a/osdk/deps/test-kernel/Cargo.toml b/osdk/deps/test-kernel/Cargo.toml index 3bafa18b..1121f498 100644 --- a/osdk/deps/test-kernel/Cargo.toml +++ b/osdk/deps/test-kernel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "osdk-test-kernel" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "The OSTD-based kernel for running unit tests with OSDK." license = "MPL-2.0" @@ -10,7 +10,7 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ostd = { version = "0.12.0", path = "../../../ostd" } +ostd = { version = "0.13.0", path = "../../../ostd" } owo-colors = "4.0.0" [lints] diff --git a/ostd/Cargo.toml b/ostd/Cargo.toml index 5473d54b..781abbef 100644 --- a/ostd/Cargo.toml +++ b/ostd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ostd" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "Rust OS framework that facilitates the development of and innovation in OS kernels" license = "MPL-2.0" @@ -25,13 +25,13 @@ id-alloc = { path = "libs/id-alloc", version = "0.1.0" } inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-macro", rev = "98f7e3e", version = "0.1.0" } int-to-c-enum = { path = "../kernel/libs/int-to-c-enum", version = "0.1.0" } intrusive-collections = { version = "0.9.6", features = ["nightly"] } -linux-boot-params = { version = "0.12.0", path = "libs/linux-bzimage/boot-params" } +linux-boot-params = { version = "0.13.0", path = "libs/linux-bzimage/boot-params" } log = "0.4" num = { version = "0.4", default-features = false } num-derive = { version = "0.4", default-features = false } num-traits = { version = "0.2", default-features = false } -ostd-macros = { version = "0.12.0", path = "libs/ostd-macros" } -ostd-test = { version = "0.12.0", path = "libs/ostd-test" } +ostd-macros = { version = "0.13.0", path = "libs/ostd-macros" } +ostd-test = { version = "0.13.0", path = "libs/ostd-test" } ostd-pod = { git = "https://github.com/asterinas/ostd-pod", rev = "c4644be", version = "0.1.1" } spin = "0.9.4" smallvec = "1.13.2" diff --git a/ostd/libs/linux-bzimage/boot-params/Cargo.toml b/ostd/libs/linux-bzimage/boot-params/Cargo.toml index 656de232..3fb472bc 100644 --- a/ostd/libs/linux-bzimage/boot-params/Cargo.toml +++ b/ostd/libs/linux-bzimage/boot-params/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "linux-boot-params" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "The Boot Parameters for Linux Boot Protocol" license = "MPL-2.0" diff --git a/ostd/libs/linux-bzimage/builder/Cargo.toml b/ostd/libs/linux-bzimage/builder/Cargo.toml index a53224cb..3e6321b7 100644 --- a/ostd/libs/linux-bzimage/builder/Cargo.toml +++ b/ostd/libs/linux-bzimage/builder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "linux-bzimage-builder" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "Linux boot compatibility for modern OSes" license = "MPL-2.0" diff --git a/ostd/libs/linux-bzimage/setup/Cargo.toml b/ostd/libs/linux-bzimage/setup/Cargo.toml index 24e2face..cfc133d7 100644 --- a/ostd/libs/linux-bzimage/setup/Cargo.toml +++ b/ostd/libs/linux-bzimage/setup/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "linux-bzimage-setup" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "The linux bzImage setup binary" license = "MPL-2.0" @@ -16,7 +16,7 @@ path = "src/main.rs" cfg-if = "1.0.0" core2 = { version = "0.4.0", default-features = false, features = ["nightly"] } libflate = { version = "2.1.0", default-features = false } -linux-boot-params = { version = "0.12.0", path = "../boot-params" } +linux-boot-params = { version = "0.13.0", path = "../boot-params" } uart_16550 = "0.3.0" xmas-elf = "0.9.1" diff --git a/ostd/libs/ostd-macros/Cargo.toml b/ostd/libs/ostd-macros/Cargo.toml index 42a1919a..777cab2c 100644 --- a/ostd/libs/ostd-macros/Cargo.toml +++ b/ostd/libs/ostd-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ostd-macros" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "OSTD's proc macros" license = "MPL-2.0" diff --git a/ostd/libs/ostd-test/Cargo.toml b/ostd/libs/ostd-test/Cargo.toml index 0346cdb7..b7ec8d36 100644 --- a/ostd/libs/ostd-test/Cargo.toml +++ b/ostd/libs/ostd-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ostd-test" -version = "0.12.0" +version = "0.13.0" edition = "2021" description = "The kernel mode unit testing framework of OSTD" license = "MPL-2.0"