diff --git a/.github/workflows/push_git_tag.yml b/.github/workflows/push_git_tag.yml index 2dbfa76d..5f5470d2 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.14.1 + tag: v0.15.0 diff --git a/Cargo.lock b/Cargo.lock index 7c8ec6de..dfca4676 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1050,11 +1050,11 @@ dependencies = [ [[package]] name = "linux-boot-params" -version = "0.14.1" +version = "0.15.0" [[package]] name = "linux-bzimage-builder" -version = "0.14.1" +version = "0.15.0" dependencies = [ "align_ext", "bitflags 1.3.2", @@ -1066,7 +1066,7 @@ dependencies = [ [[package]] name = "linux-bzimage-setup" -version = "0.14.1" +version = "0.15.0" dependencies = [ "cfg-if", "core2", @@ -1285,7 +1285,7 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "osdk-frame-allocator" -version = "0.14.1" +version = "0.15.0" dependencies = [ "log", "ostd", @@ -1294,7 +1294,7 @@ dependencies = [ [[package]] name = "osdk-heap-allocator" -version = "0.14.1" +version = "0.15.0" dependencies = [ "log", "ostd", @@ -1302,7 +1302,7 @@ dependencies = [ [[package]] name = "osdk-test-kernel" -version = "0.14.1" +version = "0.15.0" dependencies = [ "ostd", "owo-colors 4.2.0", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "ostd" -version = "0.14.1" +version = "0.15.0" dependencies = [ "acpi", "align_ext", @@ -1347,7 +1347,7 @@ dependencies = [ [[package]] name = "ostd-macros" -version = "0.14.1" +version = "0.15.0" dependencies = [ "proc-macro2", "quote", @@ -1375,7 +1375,7 @@ dependencies = [ [[package]] name = "ostd-test" -version = "0.14.1" +version = "0.15.0" [[package]] name = "owo-colors" diff --git a/VERSION b/VERSION index c39e9c5f..7092c7c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.14.1 \ No newline at end of file +0.15.0 \ No newline at end of file diff --git a/osdk/Cargo.lock b/osdk/Cargo.lock index a904769f..1fe51c6e 100644 --- a/osdk/Cargo.lock +++ b/osdk/Cargo.lock @@ -184,7 +184,7 @@ dependencies = [ [[package]] name = "cargo-osdk" -version = "0.14.1" +version = "0.15.0" dependencies = [ "assert_cmd", "chrono", @@ -598,7 +598,7 @@ dependencies = [ [[package]] name = "linux-bzimage-builder" -version = "0.14.1" +version = "0.15.0" dependencies = [ "align_ext", "bitflags 1.3.2", diff --git a/osdk/Cargo.toml b/osdk/Cargo.toml index 42cb3585..b130561f 100644 --- a/osdk/Cargo.toml +++ b/osdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-osdk" -version = "0.14.1" +version = "0.15.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.14.1", path = "../ostd/libs/linux-bzimage/builder" } +linux-bzimage-builder = { version = "0.15.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 d6fa8e33..a24ef633 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.14.1" +version = "0.15.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.14.1", path = "../../../ostd" } +ostd = { version = "0.15.0", path = "../../../ostd" } paste = "1.0.15" [lints] diff --git a/osdk/deps/heap-allocator/Cargo.toml b/osdk/deps/heap-allocator/Cargo.toml index a7759e67..f96ba4cb 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.14.1" +version = "0.15.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.14.1", path = "../../../ostd" } +ostd = { version = "0.15.0", path = "../../../ostd" } [lints] workspace = true diff --git a/osdk/deps/test-kernel/Cargo.toml b/osdk/deps/test-kernel/Cargo.toml index c2196ecf..fd77f94c 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.14.1" +version = "0.15.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.14.1", path = "../../../ostd" } +ostd = { version = "0.15.0", path = "../../../ostd" } owo-colors = "4.0.0" [lints] diff --git a/ostd/Cargo.toml b/ostd/Cargo.toml index 264f14ff..ff49ca89 100644 --- a/ostd/Cargo.toml +++ b/ostd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ostd" -version = "0.14.1" +version = "0.15.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.14.1", path = "libs/linux-bzimage/boot-params" } +linux-boot-params = { version = "0.15.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.14.1", path = "libs/ostd-macros" } -ostd-test = { version = "0.14.1", path = "libs/ostd-test" } +ostd-macros = { version = "0.15.0", path = "libs/ostd-macros" } +ostd-test = { version = "0.15.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 f619b159..59458f0e 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.14.1" +version = "0.15.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 73be5223..1a57c534 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.14.1" +version = "0.15.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 ce8735b1..739526c4 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.14.1" +version = "0.15.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.14.1", path = "../boot-params" } +linux-boot-params = { version = "0.15.0", path = "../boot-params" } uart_16550 = "0.3.0" xmas-elf = "0.10.0" diff --git a/ostd/libs/ostd-macros/Cargo.toml b/ostd/libs/ostd-macros/Cargo.toml index 26acb768..daac8074 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.14.1" +version = "0.15.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 b7b4e2c4..abb54719 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.14.1" +version = "0.15.0" edition = "2021" description = "The kernel mode unit testing framework of OSTD" license = "MPL-2.0" diff --git a/tools/bump_version.sh b/tools/bump_version.sh index 66dc1f97..2134c6fc 100755 --- a/tools/bump_version.sh +++ b/tools/bump_version.sh @@ -169,7 +169,7 @@ update_project_dependencies() { # Automatically bump Cargo.lock files cargo update -p aster-nix --precise $new_version # For Cargo.lock - cd osdk && cargo update -p cargo-osdk --precise $new_version # For osdk/Cargo.lock + cd ../osdk && cargo update -p cargo-osdk --precise $new_version # For osdk/Cargo.lock } # Synchronize project version to Docker version (update VERSION)