modify CI

Jackhr-arch · Jun 27, 2024 · 67b6397 · 67b6397
1 parent c72df07
commit 67b6397
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 117 deletions.
diff --git a/.github/workflows/rust.yml → .github/workflows/CI.yml b/.github/workflows/rust.yml → .github/workflows/CI.yml
@@ -59,6 +59,64 @@ jobs:
           path: artifacts
           retention-days: 5
 
+  build-linux-arm64:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Mihomo
+        run: |
+          wget --output-document mihomo.gz https://github.com/MetaCubeX/mihomo/releases/download/v1.18.4/mihomo-linux-amd64-v1.18.4.gz
+          gunzip mihomo.gz
+          chmod +x mihomo
+          nohup ./mihomo -d Example -f Example/basic_clash_config.yaml &
+
+      - name: Cache Target
+        uses: actions/cache@v4
+        with:
+          path: |
+            ./clashtui/target
+            ~/.cargo
+          key: ci-${{ runner.os }}-arm64-${{ hashFiles('./clashtui/Cargo.lock') }}
+          restore-keys: |
+            ci-${{ runner.os }}-arm64-${{ hashFiles('./clashtui/Cargo.lock') }}
+            ci-${{ runner.os }}-arm64-
+
+      - name: Download Dependencies
+        run: |
+          cd clashtui 
+          rustup target add aarch64-unknown-linux-gnu
+          cargo install cargo-zigbuild
+          cargo fetch 
+
+      - name: Run tests
+        run: cd clashtui && cargo test --all --verbose
+
+      - name: Build
+        run: |
+          cd clashtui 
+          cargo zigbuild --target aarch64-unknown-linux-gnu.2.17 --all-features --verbose --locked 
+          cargo zigbuild --target aarch64-unknown-linux-gnu.2.17 --release --locked
+
+      - name: Build Version
+        run: echo "Refer to build-linux"
+
+      - name: Pre Upload
+        run: |
+          mkdir artifacts
+          mv ./clashtui/target/release/clashtui ./artifacts/clashtui.arm64.release
+          mv ./clashtui/target/debug/clashtui ./artifacts/clashtui.arm64.debug
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux_Arm64_Build
+          path: artifacts
+          retention-days: 5
+
   build-windows:
     runs-on: windows-latest
     steps:
@@ -114,7 +172,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
 
-    needs: [build-linux, build-windows]
+    needs: [build-linux, build-linux-arm64, build-windows]
 
     if: startsWith(github.ref, 'refs/tags/')
 

diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -31,7 +31,7 @@ jobs:
         run: cd clashtui && cargo test --all --verbose
 
       - name: Build Version
-        run: cd clashtui && cargo r -- -v
+        run: cd clashtui && cargo r -- -V
 
       - name: Pre Upload
         run: |
@@ -66,7 +66,7 @@ jobs:
       #   run: cd clashtui && cargo test --all --verbose
 
       - name: Build Version
-        run: cd clashtui && cargo r -- -v
+        run: cd clashtui && cargo r -- -V
 
       - name: Pre Upload
         run: |

diff --git a/clashtui/api/src/clash.rs b/clashtui/api/src/clash.rs
@@ -23,7 +23,7 @@ impl Resp {
         std::io::copy(&mut inner, w)
     }
 }
-#[cfg_attr(debug_assertions, derive(Debug))]
+#[derive(Debug)]
 pub struct ClashUtil {
     api: String,
     secret: Option<String>,