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

Signed-off-by: longjin <[email protected]>
DragonOS-Community · Oct 11, 2024 · 40db1e6 · 40db1e6
1 parent 53629ac
commit 40db1e6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -12,14 +12,14 @@ jobs:
     name: Format check ${{ matrix.arch }}
     runs-on: ubuntu-latest
     continue-on-error: true
-    container: dragonos/dragonos-dev:v1.3
+    container: dragonos/dragonos-dev:v1.4
 
     strategy:
       matrix:
         arch: [x86_64, riscv64]
 
     steps:
-    - run: echo "Running in dragonos/dragonos-dev:v1.3"
+    - run: echo "Running in dragonos/dragonos-dev:v1.4"
     - uses: actions/checkout@v3
 
     - name: Format check
@@ -35,14 +35,14 @@ jobs:
     name: Kernel static test ${{ matrix.arch }}
     runs-on: ubuntu-latest
     continue-on-error: true
-    container: dragonos/dragonos-dev:v1.3
+    container: dragonos/dragonos-dev:v1.4
 
     strategy:
       matrix:
         arch: [x86_64, riscv64]
 
     steps:
-    - run: echo "Running in dragonos/dragonos-dev:v1.3"
+    - run: echo "Running in dragonos/dragonos-dev:v1.4"
 
     - uses: actions/checkout@v3
 
@@ -56,10 +56,10 @@ jobs:
   build-x86_64:
 
     runs-on: ubuntu-latest
-    container: dragonos/dragonos-dev:v1.3
+    container: dragonos/dragonos-dev:v1.4
 
     steps:
-    - run: echo "Running in dragonos/dragonos-dev:v1.3"
+    - run: echo "Running in dragonos/dragonos-dev:v1.4"
 
     - uses: actions/checkout@v3
     - name: build the DragonOS
@@ -78,10 +78,10 @@ jobs:
   build-riscv64:
 
     runs-on: ubuntu-latest
-    container: dragonos/dragonos-dev:v1.3
+    container: dragonos/dragonos-dev:v1.4
 
     steps:
-    - run: echo "Running in dragonos/dragonos-dev:v1.3"
+    - run: echo "Running in dragonos/dragonos-dev:v1.4"
 
     - uses: actions/checkout@v3
       with:

diff --git a/tools/BUILD_CONTAINER_VERSION b/tools/BUILD_CONTAINER_VERSION
@@ -1 +1 @@
-v1.3
+v1.4
diff --git a/tools/bootstrap.sh b/tools/bootstrap.sh
@@ -232,6 +232,7 @@ rustInstall() {
 
         echo "正在安装DragonOS所需的rust组件...首次安装需要一些时间来更新索引，请耐心等待..."
         cargo install cargo-binutils
+		cargo install bpf-linker
 		rustup toolchain install nightly-2023-08-15-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