[config] Use axconfig-gen in crates.io

arceos-org · Dec 30, 2024 · 897d8f5 · 897d8f5
1 parent 0dc32da
commit 897d8f5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 env:
   qemu-version: 8.2.0
   rust-toolchain: nightly-2024-12-25
-  arceos-apps: '57c8074'
+  arceos-apps: '53914e4'
 
 jobs:
   unit-test:
@@ -45,5 +45,6 @@ jobs:
       run: |
         make disk_img
         git clone https://github.com/arceos-org/arceos-apps.git
-        cd arceos-apps && cp ../Cargo.lock . && git reset --hard ${{ env.arceos-apps }} && cd ..
-        make -C arceos-apps test AX_ROOT=$(pwd) ARCH=${{ matrix.arch }}
+        cd arceos-apps && git reset --hard ${{ env.arceos-apps }} && cd ..
+        make -C arceos-apps chaxroot AX_ROOT=$(pwd)
+        make -C arceos-apps test ARCH=${{ matrix.arch }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/modules/axconfig/Cargo.toml b/modules/axconfig/Cargo.toml
@@ -10,4 +10,4 @@ repository = "https://github.com/arceos-org/arceos/tree/main/modules/axconfig"
 documentation = "https://arceos-org.github.io/arceos/axconfig/index.html"
 
 [dependencies]
-axconfig-gen-macros = { git = "https://github.com/arceos-org/axconfig-gen.git", features = ["nightly"] }
+axconfig-gen-macros = { version = "0.1.0", features = ["nightly"] }
diff --git a/scripts/make/config.mk b/scripts/make/config.mk
@@ -25,7 +25,7 @@ endif
 
 _axconfig-gen:
 ifeq ($(shell axconfig-gen --version 2>/dev/null),)
-	$(call run_cmd,RUSTFLAGS="" cargo,install --git https://github.com/arceos-org/axconfig-gen.git)
+	$(call run_cmd,RUSTFLAGS="" cargo,install axconfig-gen)
 endif
 
 .PHONY: _axconfig-gen