Bump version to 0.9.4

This commit is contained in:
Jianfeng Jiang 2024-10-22 11:00:48 +00:00 committed by Tate, Hongliang Tian
parent f320ac0166
commit fe339fd81e
22 changed files with 47 additions and 47 deletions

View File

@ -68,7 +68,7 @@ jobs:
fail-fast: false fail-fast: false
timeout-minutes: 60 timeout-minutes: 60
container: container:
image: asterinas/asterinas:0.9.3 image: asterinas/asterinas:0.9.4
options: --device=/dev/kvm options: --device=/dev/kvm
env: env:
# Need to set up proxy since the self-hosted CI server is located in China, # Need to set up proxy since the self-hosted CI server is located in China,

View File

@ -17,7 +17,7 @@ jobs:
publish: publish:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 10 timeout-minutes: 10
container: asterinas/asterinas:0.9.3 container: asterinas/asterinas:0.9.4
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

View File

@ -17,7 +17,7 @@ jobs:
build_and_deploy: build_and_deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
container: asterinas/asterinas:0.9.3 container: asterinas/asterinas:0.9.4
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

View File

@ -18,4 +18,4 @@ jobs:
uses: pxpm/github-tag-action@1.0.1 uses: pxpm/github-tag-action@1.0.1
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
tag: v0.9.3 tag: v0.9.4

View File

@ -14,9 +14,9 @@ jobs:
if: github.event_name == 'push' || github.event_name == 'pull_request' if: github.event_name == 'push' || github.event_name == 'pull_request'
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
container: asterinas/asterinas:0.9.3 container: asterinas/asterinas:0.9.4
steps: steps:
- run: echo "Running in asterinas/asterinas:0.9.3" - run: echo "Running in asterinas/asterinas:0.9.4"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -28,9 +28,9 @@ jobs:
if: github.event_name == 'push' || github.event_name == 'pull_request' if: github.event_name == 'push' || github.event_name == 'pull_request'
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
container: asterinas/asterinas:0.9.3 container: asterinas/asterinas:0.9.4
steps: steps:
- run: echo "Running in asterinas/asterinas:0.9.3" - run: echo "Running in asterinas/asterinas:0.9.4"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
container: container:
image: asterinas/asterinas:0.9.3 image: asterinas/asterinas:0.9.4
options: --device=/dev/kvm options: --device=/dev/kvm
strategy: strategy:
matrix: matrix:
@ -66,7 +66,7 @@ jobs:
fail-fast: false fail-fast: false
steps: steps:
- run: echo "Running in asterinas/asterinas:0.9.3" - run: echo "Running in asterinas/asterinas:0.9.4"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -118,7 +118,7 @@ jobs:
runs-on: self-hosted runs-on: self-hosted
timeout-minutes: 30 timeout-minutes: 30
container: container:
image: asterinas/asterinas:0.9.3-tdx image: asterinas/asterinas:0.9.4-tdx
options: --device=/dev/kvm --privileged options: --device=/dev/kvm --privileged
env: env:
# Need to set up proxy since the self-hosted CI server is located in China, # Need to set up proxy since the self-hosted CI server is located in China,
@ -126,7 +126,7 @@ jobs:
RUSTUP_DIST_SERVER: https://mirrors.ustc.edu.cn/rust-static RUSTUP_DIST_SERVER: https://mirrors.ustc.edu.cn/rust-static
RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup
steps: steps:
- run: echo "Running in asterinas/asterinas:0.9.3-tdx" - run: echo "Running in asterinas/asterinas:0.9.4-tdx"
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up the environment - name: Set up the environment
run: | run: |

View File

@ -23,7 +23,7 @@ jobs:
run: | run: |
docker run \ docker run \
--privileged --network=host --device=/dev/kvm \ --privileged --network=host --device=/dev/kvm \
-v ./:/root/asterinas asterinas/asterinas:0.9.3 \ -v ./:/root/asterinas asterinas/asterinas:0.9.4 \
make run AUTO_TEST=vsock ENABLE_KVM=0 SCHEME=microvm RELEASE_MODE=1 & make run AUTO_TEST=vsock ENABLE_KVM=0 SCHEME=microvm RELEASE_MODE=1 &
- name: Run Vsock Client on Host - name: Run Vsock Client on Host
id: host_vsock_client id: host_vsock_client

View File

@ -21,9 +21,9 @@ jobs:
timeout-minutes: 30 timeout-minutes: 30
strategy: strategy:
matrix: matrix:
# asterinas/asterinas:0.9.3 container is the developing container of asterinas, # asterinas/asterinas:0.9.4 container is the developing container of asterinas,
# asterinas/osdk:0.9.3 container is built with the intructions from Asterinas Book # asterinas/osdk:0.9.4 container is built with the intructions from Asterinas Book
container: ['asterinas/asterinas:0.9.3', 'asterinas/osdk:0.9.3'] container: ['asterinas/asterinas:0.9.4', 'asterinas/osdk:0.9.4']
fail-fast: false fail-fast: false
container: ${{ matrix.container }} container: ${{ matrix.container }}
steps: steps:
@ -33,7 +33,7 @@ jobs:
- name: Lint - name: Lint
id: lint id: lint
if: matrix.container == 'asterinas/asterinas:0.9.3' if: matrix.container == 'asterinas/asterinas:0.9.4'
run: make check_osdk run: make check_osdk
# Github's actions/checkout@v4 will result in a new user (not root) # 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 RUSTUP_UPDATE_ROOT: https://mirrors.ustc.edu.cn/rust-static/rustup
strategy: strategy:
matrix: matrix:
# asterinas/asterinas:0.9.3-tdx container is the developing container of asterinas, # asterinas/asterinas:0.9.4-tdx container is the developing container of asterinas,
# asterinas/osdk:0.9.3-tdx container is built with the intructions from Asterinas Book # asterinas/osdk:0.9.4-tdx container is built with the intructions from Asterinas Book
container: ['asterinas/asterinas:0.9.3-tdx', 'asterinas/osdk:0.9.3-tdx'] container: ['asterinas/asterinas:0.9.4-tdx', 'asterinas/osdk:0.9.4-tdx']
fail-fast: false fail-fast: false
container: container:
image: ${{ matrix.container }} image: ${{ matrix.container }}
@ -66,7 +66,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Lint - name: Lint
id: lint id: lint
if: matrix.container == 'asterinas/asterinas:0.9.3-tdx' if: matrix.container == 'asterinas/asterinas:0.9.4-tdx'
run: make check_osdk run: make check_osdk
# Github's actions/checkout@v4 will result in a new user (not root) # 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. # and thus not using the Rust environment we set up in the container.

14
Cargo.lock generated
View File

@ -861,11 +861,11 @@ dependencies = [
[[package]] [[package]]
name = "linux-boot-params" name = "linux-boot-params"
version = "0.9.3" version = "0.9.4"
[[package]] [[package]]
name = "linux-bzimage-builder" name = "linux-bzimage-builder"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -876,7 +876,7 @@ dependencies = [
[[package]] [[package]]
name = "linux-bzimage-setup" name = "linux-bzimage-setup"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cfg-if", "cfg-if",
@ -1084,7 +1084,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]] [[package]]
name = "osdk-test-kernel" name = "osdk-test-kernel"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"ostd", "ostd",
"owo-colors 4.0.0", "owo-colors 4.0.0",
@ -1092,7 +1092,7 @@ dependencies = [
[[package]] [[package]]
name = "ostd" name = "ostd"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"acpi", "acpi",
"align_ext", "align_ext",
@ -1135,7 +1135,7 @@ dependencies = [
[[package]] [[package]]
name = "ostd-macros" name = "ostd-macros"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1163,7 +1163,7 @@ dependencies = [
[[package]] [[package]]
name = "ostd-test" name = "ostd-test"
version = "0.9.3" version = "0.9.4"
[[package]] [[package]]
name = "owo-colors" name = "owo-colors"

View File

@ -52,7 +52,7 @@ git clone https://github.com/asterinas/asterinas
2. Run a Docker container as the development environment. 2. Run a Docker container as the development environment.
```bash ```bash
docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.9.3 docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.9.4
``` ```
3. Inside the container, go to the project folder to build and run Asterinas. 3. Inside the container, go to the project folder to build and run Asterinas.

View File

@ -49,7 +49,7 @@ git clone https://github.com/asterinas/asterinas
2. 运行一个作为开发环境的Docker容器。 2. 运行一个作为开发环境的Docker容器。
```bash ```bash
docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.9.3 docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.9.4
``` ```
3. 在容器内,进入项目文件夹构建并运行星绽。 3. 在容器内,进入项目文件夹构建并运行星绽。

View File

@ -1 +1 @@
0.9.3 0.9.4

View File

@ -48,7 +48,7 @@ docker run -it --privileged \
--network=host \ --network=host \
--device=/dev/kvm \ --device=/dev/kvm \
-v $(pwd)/asterinas:/root/asterinas \ -v $(pwd)/asterinas:/root/asterinas \
asterinas/asterinas:0.9.3 asterinas/asterinas:0.9.4
``` ```
3. Inside the container, go to the project folder to build and run Asterinas. 3. Inside the container, go to the project folder to build and run Asterinas.

View File

@ -66,7 +66,7 @@ git clone https://github.com/asterinas/asterinas
2. Run a Docker container as the development environment. 2. Run a Docker container as the development environment.
```bash ```bash
docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.9.3-tdx docker run -it --privileged --network=host --device=/dev/kvm -v $(pwd)/asterinas:/root/asterinas asterinas/asterinas:0.9.4-tdx
``` ```
3. Inside the container, 3. Inside the container,

4
osdk/Cargo.lock generated
View File

@ -186,7 +186,7 @@ dependencies = [
[[package]] [[package]]
name = "cargo-osdk" name = "cargo-osdk"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"chrono", "chrono",
@ -623,7 +623,7 @@ dependencies = [
[[package]] [[package]]
name = "linux-bzimage-builder" name = "linux-bzimage-builder"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",

View File

@ -1,6 +1,6 @@
[package] [package]
name = "cargo-osdk" name = "cargo-osdk"
version = "0.9.3" version = "0.9.4"
edition = "2021" edition = "2021"
description = "Accelerate OS development with Asterinas OSDK" description = "Accelerate OS development with Asterinas OSDK"
license = "MPL-2.0" 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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
linux-bzimage-builder = { version = "0.9.3", path = "../ostd/libs/linux-bzimage/builder" } linux-bzimage-builder = { version = "0.9.4", path = "../ostd/libs/linux-bzimage/builder" }
clap = { version = "4.4.17", features = ["cargo", "derive"] } clap = { version = "4.4.17", features = ["cargo", "derive"] }
chrono = "0.4.38" chrono = "0.4.38"
env_logger = "0.11.0" env_logger = "0.11.0"

View File

@ -1,6 +1,6 @@
[package] [package]
name = "osdk-test-kernel" name = "osdk-test-kernel"
version = "0.9.3" version = "0.9.4"
edition = "2021" edition = "2021"
description = "The OSTD-based kernel for running unit tests with OSDK." description = "The OSTD-based kernel for running unit tests with OSDK."
license = "MPL-2.0" license = "MPL-2.0"
@ -9,5 +9,5 @@ repository ="https://github.com/asterinas/asterinas"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
ostd = { version = "0.9.3", path = "../../ostd" } ostd = { version = "0.9.4", path = "../../ostd" }
owo-colors = "4.0.0" owo-colors = "4.0.0"

View File

@ -1,6 +1,6 @@
[package] [package]
name = "ostd" name = "ostd"
version = "0.9.3" version = "0.9.4"
edition = "2021" edition = "2021"
description = "Rust OS framework that facilitates the development of and innovation in OS kernels" description = "Rust OS framework that facilitates the development of and innovation in OS kernels"
license = "MPL-2.0" license = "MPL-2.0"
@ -28,7 +28,7 @@ inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-ma
int-to-c-enum = { path = "../kernel/libs/int-to-c-enum", 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"] } intrusive-collections = { version = "0.9.6", features = ["nightly"] }
lazy_static = { version = "1.0", features = ["spin_no_std"] } lazy_static = { version = "1.0", features = ["spin_no_std"] }
linux-boot-params = { version = "0.9.3", path = "libs/linux-bzimage/boot-params" } linux-boot-params = { version = "0.9.4", path = "libs/linux-bzimage/boot-params" }
log = "0.4" log = "0.4"
num = { version = "0.4", default-features = false } num = { version = "0.4", default-features = false }
num-derive = { version = "0.4", default-features = false } num-derive = { version = "0.4", default-features = false }

View File

@ -1,6 +1,6 @@
[package] [package]
name = "linux-boot-params" name = "linux-boot-params"
version = "0.9.3" version = "0.9.4"
edition = "2021" edition = "2021"
description = "The Boot Parameters for Linux Boot Protocol" description = "The Boot Parameters for Linux Boot Protocol"
license = "MPL-2.0" license = "MPL-2.0"

View File

@ -1,6 +1,6 @@
[package] [package]
name = "linux-bzimage-builder" name = "linux-bzimage-builder"
version = "0.9.3" version = "0.9.4"
edition = "2021" edition = "2021"
description = "Linux boot compatibility for modern OSes" description = "Linux boot compatibility for modern OSes"
license = "MPL-2.0" license = "MPL-2.0"

View File

@ -1,6 +1,6 @@
[package] [package]
name = "linux-bzimage-setup" name = "linux-bzimage-setup"
version = "0.9.3" version = "0.9.4"
edition = "2021" edition = "2021"
description = "The linux bzImage setup binary" description = "The linux bzImage setup binary"
license = "MPL-2.0" license = "MPL-2.0"
@ -16,7 +16,7 @@ path = "src/main.rs"
cfg-if = "1.0.0" cfg-if = "1.0.0"
core2 = { version = "0.4.0", default-features = false, features = ["nightly"] } core2 = { version = "0.4.0", default-features = false, features = ["nightly"] }
libflate = { version = "2.1.0", default-features = false } libflate = { version = "2.1.0", default-features = false }
linux-boot-params = { version = "0.9.3", path = "../boot-params" } linux-boot-params = { version = "0.9.4", path = "../boot-params" }
uart_16550 = "0.3.0" uart_16550 = "0.3.0"
xmas-elf = "0.9.1" xmas-elf = "0.9.1"

View File

@ -1,6 +1,6 @@
[package] [package]
name = "ostd-macros" name = "ostd-macros"
version = "0.9.3" version = "0.9.4"
edition = "2021" edition = "2021"
description = "OSTD's proc macros" description = "OSTD's proc macros"
license = "MPL-2.0" license = "MPL-2.0"

View File

@ -1,6 +1,6 @@
[package] [package]
name = "ostd-test" name = "ostd-test"
version = "0.9.3" version = "0.9.4"
edition = "2021" edition = "2021"
description = "The kernel mode unit testing framework of OSTD" description = "The kernel mode unit testing framework of OSTD"
license = "MPL-2.0" license = "MPL-2.0"