From 60cd65d837a483486c2f68663a12e75ce9ebd2e7 Mon Sep 17 00:00:00 2001 From: Ruihan Li Date: Sat, 16 Mar 2024 00:46:36 +0800 Subject: [PATCH] Install `clang-format` in the Docker container --- .github/workflows/kernel_test.yml | 12 ++++++------ .github/workflows/osdk_publish.yml | 2 +- .github/workflows/osdk_test.yml | 4 ++-- README.md | 2 +- README_CN.md | 2 +- VERSION | 2 +- osdk/Cargo.toml | 2 +- tools/docker/Dockerfile.ubuntu22.04 | 12 +++++++++--- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.github/workflows/kernel_test.yml b/.github/workflows/kernel_test.yml index 3d849e4f8..bf12dbd1f 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.4.0 + container: asterinas/asterinas:0.4.1 steps: - - run: echo "Running in asterinas/asterinas:0.4.0" + - run: echo "Running in asterinas/asterinas:0.4.1" - uses: actions/checkout@v4 @@ -23,9 +23,9 @@ jobs: unit-test: runs-on: ubuntu-latest timeout-minutes: 15 - container: asterinas/asterinas:0.4.0 + container: asterinas/asterinas:0.4.1 steps: - - run: echo "Running in asterinas/asterinas:0.4.0" + - run: echo "Running in asterinas/asterinas:0.4.1" - uses: actions/checkout@v4 @@ -42,9 +42,9 @@ jobs: integration-test: runs-on: ubuntu-latest timeout-minutes: 30 - container: asterinas/asterinas:0.4.0 + container: asterinas/asterinas:0.4.1 steps: - - run: echo "Running in asterinas/asterinas:0.4.0" + - run: echo "Running in asterinas/asterinas:0.4.1" - uses: actions/checkout@v4 diff --git a/.github/workflows/osdk_publish.yml b/.github/workflows/osdk_publish.yml index fecb83805..abb996f23 100644 --- a/.github/workflows/osdk_publish.yml +++ b/.github/workflows/osdk_publish.yml @@ -12,7 +12,7 @@ jobs: osdk-publish: runs-on: ubuntu-latest timeout-minutes: 10 - container: asterinas/asterinas:0.4.0 + container: asterinas/asterinas:0.4.1 steps: - uses: actions/checkout@v4 - uses: katyo/publish-crates@v2 diff --git a/.github/workflows/osdk_test.yml b/.github/workflows/osdk_test.yml index 43cd5fc3a..3d79de64a 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: 10 - container: asterinas/asterinas:0.4.0 + container: asterinas/asterinas:0.4.1 steps: - - run: echo "Running in asterinas/asterinas:0.4.0" + - run: echo "Running in asterinas/asterinas:0.4.1" - uses: actions/checkout@v4 diff --git a/README.md b/README.md index f6dd5e537..3a85a9c09 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.0 +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.4.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 3044d0ca5..4fbb889ec 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.0 +docker run -it --privileged --network=host --device=/dev/kvm -v ./asterinas:/root/asterinas asterinas/asterinas:0.4.1 ``` 3. 在容器内，进入项目文件夹构建并运行星绽。 diff --git a/VERSION b/VERSION index 1d0ba9ea1..267577d47 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.0 +0.4.1 diff --git a/osdk/Cargo.toml b/osdk/Cargo.toml index 8822d206d..330ebcbd8 100644 --- a/osdk/Cargo.toml +++ b/osdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-osdk" -version = "0.4.0" +version = "0.4.1" edition = "2021" description = "Accelerate OS development with Asterinas OSDK" license = "MPL-2.0" diff --git a/tools/docker/Dockerfile.ubuntu22.04 b/tools/docker/Dockerfile.ubuntu22.04 index 50c56d20e..7de884d50 100644 --- a/tools/docker/Dockerfile.ubuntu22.04 +++ b/tools/docker/Dockerfile.ubuntu22.04 @@ -1,22 +1,27 @@ # SPDX-License-Identifier: MPL-2.0 +#= Install packages for Docker building ==================================== + FROM ubuntu:22.04 as build-base SHELL ["/bin/bash", "-c"] ARG DEBIAN_FRONTEND=noninteractive + +# Please keep the list sorted by name RUN apt update && apt-get install -y --no-install-recommends \ build-essential \ ca-certificates \ curl \ git-core \ + gnupg \ libssl-dev \ - python-is-python3 \ python3-pip \ - wget \ - gnupg + python-is-python3 \ + wget #= Build benchmark ========================================================= + FROM build-base as build-benchmarks # Download the source files of benchmarks @@ -219,6 +224,7 @@ FROM rust # Install all Asterinas dependent packages RUN apt update && apt-get install -y --no-install-recommends \ + clang-format `# formatting regression tests` \ cpio \ cpuid \ exfatprogs \