Merge pull request #36 from powerAn2020/dev

合并代码
powerAn2020 · Dec 6, 2024 · 4a7bfe5 · 4a7bfe5
2 parents 8bed141 + 26ceb68
commit 4a7bfe5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -109,6 +109,7 @@ jobs:
           cp -rf zerotier-one ../zerotier-one-arm64
 
       - name: Build Zerotier for arm
+        if: ${{ env.SKIP_NEXT != 'true' }}
         run: |
           export PATH="$PWD/toolchain/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/bin/:${PATH}"
           cd ZeroTierOne_ARM

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -109,6 +109,7 @@ jobs:
           cp -rf zerotier-one ../zerotier-one-arm64
 
       - name: Build Zerotier for arm
+        if: ${{ env.SKIP_NEXT != 'true' }}
         run: |
           export PATH="$PWD/toolchain/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/bin/:${PATH}"
           cd ZeroTierOne_ARM

diff --git a/ui-src/package.json b/ui-src/package.json
@@ -29,6 +29,6 @@
     "patch-package": "^8.0.0",
     "unplugin-auto-import": "^0.18.3",
     "unplugin-vue-components": "^0.27.4",
-    "vite": "^5.4.8"
+    "vite": "^6.0.1"
   }
 }
diff --git a/ui-src/src/tools.js b/ui-src/src/tools.js
@@ -1,4 +1,4 @@
-import { exec, spawn,moduleInfo } from 'kernelsu';
+import { exec, spawn } from 'kernelsu';
 import {Buffer} from 'buffer'
 export const MODDIR = '/data/adb/modules/ZeroTierForKSU'
 export const ZTPATH = '/data/adb/zerotier'
@@ -14,7 +14,7 @@ export const execCmd = async (cmd) => {
     console.error(stderr)
   }
 }
-console.info(moduleInfo())
+// console.info(moduleInfo())
 export const execCmdWithErrno = async (cmd) => {
   console.info(cmd)
   const { errno, stdout, stderr} = await exec(cmd, { cwd: '/' });