mirror of
https://github.com/asterinas/asterinas.git
synced 2025-06-24 09:53:24 +00:00
Bump version to 0.4.2
Add GDB in OSDK Dockerfile
This commit is contained in:
committed by
Tate, Hongliang Tian
parent
1d5744ae80
commit
6ab6648b33
13
.github/workflows/docker_build.yml
vendored
13
.github/workflows/docker_build.yml
vendored
@ -29,7 +29,7 @@ jobs:
|
|||||||
echo "aster_version=$( cat VERSION )" >> "$GITHUB_OUTPUT"
|
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"
|
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
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@ -39,3 +39,14 @@ jobs:
|
|||||||
tags: asterinas/asterinas:${{ steps.fetch-versions.outputs.aster_version }}
|
tags: asterinas/asterinas:${{ steps.fetch-versions.outputs.aster_version }}
|
||||||
build-args: |
|
build-args: |
|
||||||
"ASTER_RUST_VERSION=${{ steps.fetch-versions.outputs.rust_version }}"
|
"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 }}"
|
||||||
|
4
.github/workflows/osdk_test.yml
vendored
4
.github/workflows/osdk_test.yml
vendored
@ -37,9 +37,9 @@ jobs:
|
|||||||
osdk-doc-env-test:
|
osdk-doc-env-test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 15
|
timeout-minutes: 15
|
||||||
container: asterinas/osdk:0.4.0
|
container: asterinas/osdk:0.4.2
|
||||||
steps:
|
steps:
|
||||||
- run: echo "Running in asterinas/osdk:0.4.0"
|
- run: echo "Running in asterinas/osdk:0.4.2"
|
||||||
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
@ -51,7 +51,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 ./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.
|
3. Inside the container, go to the project folder to build and run Asterinas.
|
||||||
|
@ -48,7 +48,7 @@ git clone https://github.com/asterinas/asterinas
|
|||||||
2. 运行一个作为开发环境的Docker容器。
|
2. 运行一个作为开发环境的Docker容器。
|
||||||
|
|
||||||
```bash
|
```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. 在容器内,进入项目文件夹构建并运行星绽。
|
3. 在容器内,进入项目文件夹构建并运行星绽。
|
||||||
|
2
osdk/Cargo.lock
generated
2
osdk/Cargo.lock
generated
@ -128,7 +128,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cargo-osdk"
|
name = "cargo-osdk"
|
||||||
version = "0.4.1"
|
version = "0.4.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"assert_cmd",
|
"assert_cmd",
|
||||||
"clap",
|
"clap",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cargo-osdk"
|
name = "cargo-osdk"
|
||||||
version = "0.4.1"
|
version = "0.4.2"
|
||||||
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"
|
||||||
|
@ -26,9 +26,7 @@ pub fn execute_debug_command(config: &DebugConfig) {
|
|||||||
gdb.status().unwrap();
|
gdb.status().unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: Failed because the test env have no gdb.
|
#[test]
|
||||||
// #[test]
|
|
||||||
#[allow(dead_code)]
|
|
||||||
fn have_gdb_installed() {
|
fn have_gdb_installed() {
|
||||||
let output = Command::new("gdb").arg("--version").output();
|
let output = Command::new("gdb").arg("--version").output();
|
||||||
assert!(output.is_ok(), "Failed to run gdb");
|
assert!(output.is_ok(), "Failed to run gdb");
|
||||||
|
@ -20,6 +20,7 @@ ARG DEBIAN_FRONTEND=noninteractive
|
|||||||
RUN apt update \
|
RUN apt update \
|
||||||
&& apt install -y \
|
&& apt install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
|
gdb \
|
||||||
curl \
|
curl \
|
||||||
grub-efi-amd64 \
|
grub-efi-amd64 \
|
||||||
grub2-common \
|
grub2-common \
|
||||||
|
Reference in New Issue
Block a user