From 4700ab71bc2a6840bc339444cea33ac5a23d0625 Mon Sep 17 00:00:00 2001 From: Fabing Li Date: Wed, 26 Jun 2024 17:36:45 +0800 Subject: [PATCH] Bumped Asterinas & OSDK version to 0.5.1 --- .github/workflows/docker_build.yml | 2 +- .github/workflows/kernel_test.yml | 12 ++++++------ .github/workflows/osdk_publish.yml | 2 +- .github/workflows/osdk_test.yml | 8 ++++---- .github/workflows/release_tag.yml | 2 +- .github/workflows/update-online-api-docs.yml | 2 +- .github/workflows/update-website.yml | 2 +- .github/workflows/vsock_interaction.yml | 2 +- README.md | 2 +- README_CN.md | 2 +- VERSION | 2 +- docs/src/kernel/README.md | 2 +- docs/src/kernel/intel_tdx.md | 2 +- osdk/Cargo.toml | 2 +- tools/bump_version.sh | 1 + tools/docker/Dockerfile.jinja | 8 ++++++++ 16 files changed, 31 insertions(+), 22 deletions(-) diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index 6e21fe5c..97a4b8e8 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -50,7 +50,7 @@ jobs: - name: Generate Dockerfile for Intel TDX run: | pip install Jinja2 - python3 ./tools/docker/gen_dockerfile.py + python3 ./tools/docker/gen_dockerfile.py --intel-tdx - name: Build and push development image for Intel TDX uses: docker/build-push-action@v4 diff --git a/.github/workflows/kernel_test.yml b/.github/workflows/kernel_test.yml index 589e0950..65a7dc00 100644 --- a/.github/workflows/kernel_test.yml +++ b/.github/workflows/kernel_test.yml @@ -10,9 +10,9 @@ jobs: lint: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.5.0 + container: asterinas/asterinas:0.5.1 steps: - - run: echo "Running in asterinas/asterinas:0.5.0" + - run: echo "Running in asterinas/asterinas:0.5.1" - uses: actions/checkout@v4 @@ -23,9 +23,9 @@ jobs: unit-test: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.5.0 + container: asterinas/asterinas:0.5.1 steps: - - run: echo "Running in asterinas/asterinas:0.5.0" + - run: echo "Running in asterinas/asterinas:0.5.1" - uses: actions/checkout@v4 @@ -42,9 +42,9 @@ jobs: integration-test: runs-on: ubuntu-latest timeout-minutes: 30 - container: asterinas/asterinas:0.5.0 + container: asterinas/asterinas:0.5.1 steps: - - run: echo "Running in asterinas/asterinas:0.5.0" + - run: echo "Running in asterinas/asterinas:0.5.1" - uses: actions/checkout@v4 diff --git a/.github/workflows/osdk_publish.yml b/.github/workflows/osdk_publish.yml index e762c0c6..dc2377c2 100644 --- a/.github/workflows/osdk_publish.yml +++ b/.github/workflows/osdk_publish.yml @@ -15,7 +15,7 @@ jobs: osdk-publish: runs-on: ubuntu-latest timeout-minutes: 10 - container: asterinas/asterinas:0.5.0 + container: asterinas/asterinas:0.5.1 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/osdk_test.yml b/.github/workflows/osdk_test.yml index 4147c266..7f4cb752 100644 --- a/.github/workflows/osdk_test.yml +++ b/.github/workflows/osdk_test.yml @@ -15,9 +15,9 @@ jobs: osdk-test: runs-on: ubuntu-latest timeout-minutes: 30 - container: asterinas/asterinas:0.5.0 + container: asterinas/asterinas:0.5.1 steps: - - run: echo "Running in asterinas/asterinas:0.5.0" + - run: echo "Running in asterinas/asterinas:0.5.1" - uses: actions/checkout@v4 @@ -40,9 +40,9 @@ jobs: osdk-doc-env-test: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/osdk:0.5.0 + container: asterinas/osdk:0.5.1 steps: - - run: echo "Running in asterinas/osdk:0.5.0" + - run: echo "Running in asterinas/osdk:0.5.1" - uses: actions/checkout@v4 diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml index 40405b7f..ccace63f 100644 --- a/.github/workflows/release_tag.yml +++ b/.github/workflows/release_tag.yml @@ -17,4 +17,4 @@ jobs: uses: pxpm/github-tag-action@1.0.1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - tag: v0.5.0 + tag: v0.5.1 diff --git a/.github/workflows/update-online-api-docs.yml b/.github/workflows/update-online-api-docs.yml index d3b17b0d..3d864b84 100644 --- a/.github/workflows/update-online-api-docs.yml +++ b/.github/workflows/update-online-api-docs.yml @@ -16,7 +16,7 @@ jobs: build_and_upload: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.5.0 + container: asterinas/asterinas:0.5.1 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/update-website.yml b/.github/workflows/update-website.yml index e593630b..b54614d1 100644 --- a/.github/workflows/update-website.yml +++ b/.github/workflows/update-website.yml @@ -16,7 +16,7 @@ jobs: build_and_deploy: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.5.0 + container: asterinas/asterinas:0.5.1 steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/vsock_interaction.yml b/.github/workflows/vsock_interaction.yml index 2c1f5873..c133c9da 100644 --- a/.github/workflows/vsock_interaction.yml +++ b/.github/workflows/vsock_interaction.yml @@ -23,7 +23,7 @@ jobs: run: | docker run \ --privileged --network=host --device=/dev/kvm \ - -v ./:/root/asterinas asterinas/asterinas:0.5.0 \ + -v ./:/root/asterinas asterinas/asterinas:0.5.1 \ 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/README.md b/README.md index 7eb0a1e5..dd2d06eb 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.5.0 +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.5.1 ``` 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 cba6c281..7c4bce52 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.5.0 +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.5.1 ``` 3. 在容器内，进入项目文件夹构建并运行星绽。 diff --git a/VERSION b/VERSION index 79a2734b..5d4294b9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.0 \ No newline at end of file +0.5.1 \ No newline at end of file diff --git a/docs/src/kernel/README.md b/docs/src/kernel/README.md index a11a1a08..a9a9c4ac 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.0 +docker run -it --privileged --network=host --device=/dev/kvm -v asterinas:/root/asterinas asterinas/asterinas:0.5.1 ``` 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 56f51f47..2c740437 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.0_tdx +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.5.1_tdx ``` 3. Inside the container, diff --git a/osdk/Cargo.toml b/osdk/Cargo.toml index dd5cea6c..7e764286 100644 --- a/osdk/Cargo.toml +++ b/osdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-osdk" -version = "0.5.0" +version = "0.5.1" 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 0aed7a6c..887421b0 100755 --- a/tools/bump_version.sh +++ b/tools/bump_version.sh @@ -85,6 +85,7 @@ validate_bump_type() { exit 1 ;; esac +} # Update tag version (`v{version}`) in file $1 update_tag_version() { diff --git a/tools/docker/Dockerfile.jinja b/tools/docker/Dockerfile.jinja index e41e09ad..e7fd810c 100644 --- a/tools/docker/Dockerfile.jinja +++ b/tools/docker/Dockerfile.jinja @@ -16,10 +16,18 @@ RUN apt update && apt-get install -y --no-install-recommends \ git-core \ gnupg \ libssl-dev \ + jq \ python3-pip \ python-is-python3 \ wget +#= Download dependency ===================================================== + +WORKDIR /root/dependency +RUN wget https://raw.githubusercontent.com/asterinas/linux_vdso/2a6d2db/vdso64.so -O vdso64.so +RUN wget https://raw.githubusercontent.com/asterinas/linux_kernel/9e66d28/vmlinuz-5.15.0-105-generic \ + -O vmlinuz + #= Build benchmark ========================================================= FROM build-base as build-benchmarks