Browse Source

build: 更新构建容器版本至v1.12并指定DADK安装版本

- 将BUILD_CONTAINER_VERSION从v1.11升级到v1.12
- 修改bootstrap.sh和user/Makefile中DADK的安装方式,明确指定版本v0.4.0

Signed-off-by: longjin <longjin@DragonOS.org>
longjin 2 months ago
parent
commit
b6d976ab9c
5 changed files with 10 additions and 10 deletions
  1. 6 6
      .github/workflows/makefile.yml
  2. 1 1
      tools/BUILD_CONTAINER_VERSION
  3. 1 1
      tools/bootstrap.sh
  4. 1 1
      tools/build_in_docker.sh
  5. 1 1
      user/Makefile

+ 6 - 6
.github/workflows/makefile.yml

@@ -11,14 +11,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.11
+    container: dragonos/dragonos-dev:v1.12
 
 
     strategy:
     strategy:
       matrix:
       matrix:
         arch: [x86_64, riscv64, loongarch64]
         arch: [x86_64, riscv64, loongarch64]
 
 
     steps:
     steps:
-      - run: echo "Running in dragonos/dragonos-dev:v1.11"
+      - run: echo "Running in dragonos/dragonos-dev:v1.12"
       - 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.11
+    container: dragonos/dragonos-dev:v1.12
 
 
     strategy:
     strategy:
       matrix:
       matrix:
         arch: [x86_64, riscv64, loongarch64]
         arch: [x86_64, riscv64, loongarch64]
 
 
     steps:
     steps:
-      - run: echo "Running in dragonos/dragonos-dev:v1.11"
+      - run: echo "Running in dragonos/dragonos-dev:v1.12"
 
 
       - uses: actions/checkout@v3
       - uses: actions/checkout@v3
 
 
@@ -56,7 +56,7 @@ jobs:
   build:
   build:
     name: Build ${{ matrix.arch }}
     name: Build ${{ matrix.arch }}
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
-    container: dragonos/dragonos-dev:v1.11
+    container: dragonos/dragonos-dev:v1.12
     continue-on-error: true
     continue-on-error: true
     strategy:
     strategy:
       matrix:
       matrix:
@@ -73,7 +73,7 @@ jobs:
             checkout_params: {}
             checkout_params: {}
 
 
     steps:
     steps:
-      - run: echo "Running in dragonos/dragonos-dev:v1.11"
+      - run: echo "Running in dragonos/dragonos-dev:v1.12"
       
       
       - uses: actions/checkout@v3
       - uses: actions/checkout@v3
         with: ${{ matrix.checkout_params }}
         with: ${{ matrix.checkout_params }}

+ 1 - 1
tools/BUILD_CONTAINER_VERSION

@@ -1 +1 @@
-v1.11
+v1.12

+ 1 - 1
tools/bootstrap.sh

@@ -338,7 +338,7 @@ rustInstall
 install_python_pkg
 install_python_pkg
 
 
 # 安装dadk
 # 安装dadk
-cargo install dadk || exit 1
+cargo install --git https://git.mirrors.dragonos.org.cn/DragonOS-Community/DADK.git --tag v0.4.0 || exit 1
 
 
 bashpath=$(cd `dirname $0`; pwd)
 bashpath=$(cd `dirname $0`; pwd)
 
 

+ 1 - 1
tools/build_in_docker.sh

@@ -1,6 +1,6 @@
 docker rm -f dragonos-build || echo "No existed container"
 docker rm -f dragonos-build || echo "No existed container"
 cpu_count=$(cat /proc/cpuinfo |grep "processor"|wc -l)
 cpu_count=$(cat /proc/cpuinfo |grep "processor"|wc -l)
-docker run --rm --privileged=true --cap-add SYS_ADMIN --cap-add MKNOD -v $(pwd):/data -v /dev:/dev -v dragonos-build-cargo:/root/.cargo/registry --name dragonos-build -i dragonos/dragonos-dev:v1.11 bash << EOF
+docker run --rm --privileged=true --cap-add SYS_ADMIN --cap-add MKNOD -v $(pwd):/data -v /dev:/dev -v dragonos-build-cargo:/root/.cargo/registry --name dragonos-build -i dragonos/dragonos-dev:v1.12 bash << EOF
 source ~/.cargo/env
 source ~/.cargo/env
 source ~/.bashrc
 source ~/.bashrc
 cd /data
 cd /data

+ 1 - 1
user/Makefile

@@ -20,7 +20,7 @@ ifeq ("$(DADK_VERSION)", "")
 	@echo "\n\tcargo install --git https://git.mirrors.dragonos.org.cn/DragonOS-Community/DADK.git --tag v$(MIN_DADK_VERSION)" --locked
 	@echo "\n\tcargo install --git https://git.mirrors.dragonos.org.cn/DragonOS-Community/DADK.git --tag v$(MIN_DADK_VERSION)" --locked
 	@echo "\n"
 	@echo "\n"
 	@echo "Auto installing dadk..."
 	@echo "Auto installing dadk..."
-	cargo install dadk
+	cargo install --git https://git.mirrors.dragonos.org.cn/DragonOS-Community/DADK.git --tag v$(MIN_DADK_VERSION)" --locked
 else
 else
 # 如果DADK版本过低,则自动更新
 # 如果DADK版本过低,则自动更新
 	@echo "dadk version $(DADK_VERSION) installed"
 	@echo "dadk version $(DADK_VERSION) installed"