From 6ab6648b3322e710be4b1268648e4f107e7c6a48 Mon Sep 17 00:00:00 2001 From: fgh1999 Date: Sat, 23 Mar 2024 11:56:58 +0000 Subject: [PATCH] Bump version to 0.4.2 Add GDB in OSDK Dockerfile --- .github/workflows/docker_build.yml | 13 ++++++++++++- .github/workflows/osdk_test.yml | 4 ++-- README.md | 2 +- README_CN.md | 2 +- VERSION | 2 +- osdk/Cargo.lock | 2 +- osdk/Cargo.toml | 2 +- osdk/src/commands/debug.rs | 4 +--- osdk/tools/Dockerfile.ubuntu22.04 | 1 + 9 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index 99846b351..0e7769a8b 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -29,7 +29,7 @@ jobs: echo "aster_version=$( cat VERSION )" >> "$GITHUB_OUTPUT" echo "rust_version=$( grep -m1 -o 'nightly-[0-9]\+-[0-9]\+-[0-9]\+' rust-toolchain.toml )" >> "$GITHUB_OUTPUT" - - name: Build and push + - name: Build and push development image uses: docker/build-push-action@v4 with: context: . @@ -39,3 +39,14 @@ jobs: tags: asterinas/asterinas:${{ steps.fetch-versions.outputs.aster_version }} build-args: | "ASTER_RUST_VERSION=${{ steps.fetch-versions.outputs.rust_version }}" + + - name: Build and push OSDK test image + uses: docker/build-push-action@v4 + with: + context: . + file: ./osdk/tools/Dockerfile.ubuntu22.04 + platforms: linux/amd64 + push: true + tags: asterinas/osdk:${{ steps.fetch-versions.outputs.aster_version }} + build-args: | + "ASTER_RUST_VERSION=${{ steps.fetch-versions.outputs.rust_version }}" diff --git a/.github/workflows/osdk_test.yml b/.github/workflows/osdk_test.yml index 81a0e6a90..9a54ab577 100644 --- a/.github/workflows/osdk_test.yml +++ b/.github/workflows/osdk_test.yml @@ -37,9 +37,9 @@ jobs: osdk-doc-env-test: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/osdk:0.4.0 + container: asterinas/osdk:0.4.2 steps: - - run: echo "Running in asterinas/osdk:0.4.0" + - run: echo "Running in asterinas/osdk:0.4.2" - uses: actions/checkout@v4 diff --git a/README.md b/README.md index 3a85a9c09..52a7ba0dd 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,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.4.1 +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.4.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 4fbb889ec..a938b2c41 100644 --- a/README_CN.md +++ b/README_CN.md @@ -48,7 +48,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.4.1 +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.4.2 ``` 3. 在容器内，进入项目文件夹构建并运行星绽。 diff --git a/VERSION b/VERSION index 267577d47..2b7c5ae01 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.1 +0.4.2 diff --git a/osdk/Cargo.lock b/osdk/Cargo.lock index b1de10ea4..b326d69a7 100644 --- a/osdk/Cargo.lock +++ b/osdk/Cargo.lock @@ -128,7 +128,7 @@ dependencies = [ [[package]] name = "cargo-osdk" -version = "0.4.1" +version = "0.4.2" dependencies = [ "assert_cmd", "clap", diff --git a/osdk/Cargo.toml b/osdk/Cargo.toml index fe4a5bdbe..4910ac0d8 100644 --- a/osdk/Cargo.toml +++ b/osdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-osdk" -version = "0.4.1" +version = "0.4.2" edition = "2021" description = "Accelerate OS development with Asterinas OSDK" license = "MPL-2.0" diff --git a/osdk/src/commands/debug.rs b/osdk/src/commands/debug.rs index 85585c1f8..5f646513d 100644 --- a/osdk/src/commands/debug.rs +++ b/osdk/src/commands/debug.rs @@ -26,9 +26,7 @@ pub fn execute_debug_command(config: &DebugConfig) { gdb.status().unwrap(); } -// FIXME: Failed because the test env have no gdb. -// #[test] -#[allow(dead_code)] +#[test] fn have_gdb_installed() { let output = Command::new("gdb").arg("--version").output(); assert!(output.is_ok(), "Failed to run gdb"); diff --git a/osdk/tools/Dockerfile.ubuntu22.04 b/osdk/tools/Dockerfile.ubuntu22.04 index 35777291e..8e78fd17e 100644 --- a/osdk/tools/Dockerfile.ubuntu22.04 +++ b/osdk/tools/Dockerfile.ubuntu22.04 @@ -20,6 +20,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt update \ && apt install -y \ build-essential \ + gdb \ curl \ grub-efi-amd64 \ grub2-common \