DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-08 18:26:48 +00:00
Code Issues Releases Wiki Activity

ci: add-bpf-linker-to-ci-image (#972)

Browse Source 
Signed-off-by: longjin <longjin@DragonOS.org>
This commit is contained in:
LoGin 2024-10-12 01:20:43 +08:00 committed by GitHub
parent 53629ac383
commit 40db1e61da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/makefile.yml vendored
View File

@ -12,14 +12,14 @@ jobs:
name: Format check ${{ matrix.arch }} name: Format check ${{ matrix.arch }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: true continue-on-error: true
container: dragonos/dragonos-dev:v1.3 container: dragonos/dragonos-dev:v1.4
strategy: strategy:
matrix: matrix:
arch: [x86_64, riscv64] arch: [x86_64, riscv64]
steps: steps:
- run: echo "Running in dragonos/dragonos-dev:v1.3" - run: echo "Running in dragonos/dragonos-dev:v1.4"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Format check - name: Format check
@ -35,14 +35,14 @@ jobs:
name: Kernel static test ${{ matrix.arch }} name: Kernel static test ${{ matrix.arch }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: true continue-on-error: true
container: dragonos/dragonos-dev:v1.3 container: dragonos/dragonos-dev:v1.4
strategy: strategy:
matrix: matrix:
arch: [x86_64, riscv64] arch: [x86_64, riscv64]
steps: steps:
- run: echo "Running in dragonos/dragonos-dev:v1.3" - run: echo "Running in dragonos/dragonos-dev:v1.4"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -56,10 +56,10 @@ jobs:
build-x86_64: build-x86_64:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: dragonos/dragonos-dev:v1.3 container: dragonos/dragonos-dev:v1.4
steps: steps:
- run: echo "Running in dragonos/dragonos-dev:v1.3" - run: echo "Running in dragonos/dragonos-dev:v1.4"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: build the DragonOS - name: build the DragonOS
@ -78,10 +78,10 @@ jobs:
build-riscv64: build-riscv64:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: dragonos/dragonos-dev:v1.3 container: dragonos/dragonos-dev:v1.4
steps: steps:
- run: echo "Running in dragonos/dragonos-dev:v1.3" - run: echo "Running in dragonos/dragonos-dev:v1.4"
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

2
tools/BUILD_CONTAINER_VERSION
View File

@ -1 +1 @@
v1.3 v1.4

1
tools/bootstrap.sh
View File

@ -232,6 +232,7 @@ rustInstall() {
echo "正在安装DragonOS所需的rust组件...首次安装需要一些时间来更新索引，请耐心等待..." echo "正在安装DragonOS所需的rust组件...首次安装需要一些时间来更新索引，请耐心等待..."
cargo install cargo-binutils cargo install cargo-binutils
cargo install bpf-linker
rustup toolchain install nightly-2023-08-15-x86_64-unknown-linux-gnu rustup toolchain install nightly-2023-08-15-x86_64-unknown-linux-gnu
rustup toolchain install $RUST_VERSION-x86_64-unknown-linux-gnu rustup toolchain install $RUST_VERSION-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu rustup component add rust-src --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu