From 897d8f5f4d5dff36c7ff1453f3a22e27d6b91acc Mon Sep 17 00:00:00 2001
From: Yuekai Jia <equation618@gmail.com>
Date: Sun, 29 Dec 2024 00:27:45 +0800
Subject: [PATCH] [config] Use axconfig-gen in crates.io

---
 .github/workflows/test.yml  | 7 ++++---
 Cargo.lock                  | 6 ++++--
 modules/axconfig/Cargo.toml | 2 +-
 scripts/make/config.mk      | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 75e5babd14..c19811c8c6 100644
--- 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
index 71e67a3821..f713d8cdb4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -236,7 +236,8 @@ dependencies = [
 [[package]]
 name = "axconfig-gen"
 version = "0.1.0"
-source = "git+https://github.com/arceos-org/axconfig-gen.git#ee91673546942d31140ec212e771be54e5b5478c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ffa518605969ff8f4ebce2cdc3b6090345152c14987ec540601335effbf36d5"
 dependencies = [
  "clap",
  "toml_edit",
@@ -245,7 +246,8 @@ dependencies = [
 [[package]]
 name = "axconfig-gen-macros"
 version = "0.1.0"
-source = "git+https://github.com/arceos-org/axconfig-gen.git#ee91673546942d31140ec212e771be54e5b5478c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92110c7e7a5633d7fb8a402393c91c326ad6d19710bb9cfa5ab4095e63c25948"
 dependencies = [
  "axconfig-gen",
  "proc-macro2",
diff --git a/modules/axconfig/Cargo.toml b/modules/axconfig/Cargo.toml
index 6f6fbb0b25..a53e43d1db 100644
--- 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
index aca61df0d6..f77493eab2 100644
--- 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