powerAn2020 · powerAn2020 · Oct 5, 2024 · Oct 5, 2024 · Oct 5, 2024
diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml
@@ -62,10 +62,10 @@ jobs:
           module_versionCode=$(grep -w 'versionCode' module.prop |awk -F'=' '{print $2}')
           echo "Scheduled event triggered this workflow"
           versionCode=$(expr 10000 + $(git rev-list --count HEAD) + 200)
-          echo "new_module_version=$versionCode" >> $GITHUB_ENV
+          echo "MODULE_VERSION=$versionCode" >> $GITHUB_ENV
           echo 'id=ZeroTierForKSU' >module.prop
           echo 'name=ZeroTier For KernelSU' >>module.prop
-          echo "version=ZeroTier Version->${{ env.VERSION }} & module Version->${versionCode}" >>module.prop
+          echo "version=${versionCode}" >>module.prop
           echo "versionCode=${versionCode}" >>module.prop
           echo 'author=powerAn2020' >>module.prop
           echo 'description=ZeroTier(${{ env.VERSION }}) with UI interface (DEV)' >>module.prop
@@ -107,21 +107,21 @@ jobs:
           mv zerotier-one-arm64 zerotier-one
           ls -la
           echo 'updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm64_dev.json' >>module.prop
-          bash build.sh ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
-          unzip -d ZeroTierForKSU-arm64-${{ env.VERSION }} ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
+          bash build.sh ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
+          unzip -d ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }} ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
           mv -f zerotier-one-arm zerotier-one
           mv -f curl bin/curl
           sed -i "s/update_arm64/update_arm/g" module.prop
-          bash build.sh ZeroTierForKSU-arm-${{ env.VERSION }}.zip
-          unzip -d ZeroTierForKSU-arm-${{ env.VERSION }} ZeroTierForKSU-arm-${{ env.VERSION }}.zip
+          bash build.sh ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
+          unzip -d ZeroTierForKSU-arm-${{ env.MODULE_VERSION }} ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
 
 
       - name: Upload artifact
         id: arm64-zip
         uses: actions/upload-artifact@v4
         with:
-          name: ZeroTierForKSU-arm64-${{ env.VERSION }}
-          path: ./ZeroTierForKSU-arm64-${{ env.VERSION }}/*
+          name: ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}
+          path: ./ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}/*
           retention-days: 7
 
       - name: Upload artifact
@@ -137,8 +137,8 @@ jobs:
         run: |
           echo "Artifact1 下载地址: ${{ steps.arm-zip.outputs.artifact-url }}"
           echo "Artifact2 下载地址: ${{ steps.arm64-zip.outputs.artifact-url }}"
-          echo '{"version":"${{ env.VERSION }}","versionCode":'${{env.new_module_version}}',"zipUrl":"${{ steps.arm64-zip.outputs.artifact-url }}","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}' >update_arm64_dev.json
-          echo '{"version":"${{ env.VERSION }}","versionCode":'${{env.new_module_version}}',"zipUrl":"${{ steps.arm-zip.outputs.artifact-url }}","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}' >update_arm_dev.json
+          echo '{"version":"${{ env.VERSION }}","versionCode":'${{env.MODULE_VERSION}}',"zipUrl":"${{ steps.arm64-zip.outputs.artifact-url }}","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}' >update_arm64_dev.json
+          echo '{"version":"${{ env.VERSION }}","versionCode":'${{env.MODULE_VERSION}}',"zipUrl":"${{ steps.arm-zip.outputs.artifact-url }}","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}' >update_arm_dev.json
       
       - name: update json
         run: |
@@ -151,5 +151,17 @@ jobs:
         if:  ${{ env.COMMIT == '1' }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: dev 
+          branch: dev
+
+      - name: Manual Release
+        uses: softprops/action-gh-release@v2
+        if: github.event_name == 'workflow_dispatch'
+        with:
+          prerelease: true
+          generate_release_notes: true
+          tag_name: ${{ env.MODULE_VERSION }}
+          name: ZeroTierForKSU-dev-${{ env.MODULE_VERSION }}
+          files: |
+            ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
+            ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
   
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: main
           fetch-depth: 0
@@ -56,32 +56,31 @@ jobs:
           if [[ "${{ env.VERSION }}" != "${module_version}" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             echo "Scheduled event triggered this workflow"
             versionCode=$(expr 10000 + $(git rev-list --count HEAD) + 200)
+            echo "MODULE_VERSION=$versionCode" >> $GITHUB_ENV
             echo '{"version":"${{ env.VERSION }}","versionCode":'${versionCode}',"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/releases/download/${{env.VERSION}}/ZeroTierForKSU-arm64-${{ env.VERSION }}.zip","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/main/changelog.md"}' >update_arm64.json
             echo '{"version":"${{ env.VERSION }}","versionCode":'${versionCode}',"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/releases/download/${{env.VERSION}}/ZeroTierForKSU-arm-${{ env.VERSION }}.zip","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/main/changelog.md"}' >update_arm.json
             echo 'id=ZeroTierForKSU' >module.prop
             echo 'name=ZeroTier For KernelSU' >>module.prop
-            echo "version=ZeroTier Version->${{ env.VERSION }} & module Version->${versionCode}" >>module.prop
+            echo "version=${versionCode}" >>module.prop
             echo "versionCode=${versionCode}" >>module.prop
             echo 'author=powerAn2020' >>module.prop
             echo 'description=ZeroTier(${{ env.VERSION }}) with UI interface' >>module.prop
             git config --global user.email "action@example.com"
             git config --global user.name "github action"
-            if [[ "${{ github.event_name }}" == "schedule" ]]; then
-              wget -O RELEASE-NOTES.md https://github.com/zerotier/ZeroTierOne/raw/dev/RELEASE-NOTES.md
-              release_notes_line=$(grep -nPo '\d{4}-\d{2}-\d{2} -- Version [\d.]+' RELEASE-NOTES.md|head -2|awk -F ':' '{print $1}'|awk BEGIN{RS=EOF}'{gsub(/\n/," ");print}'|awk '{printf("start=%s; end=%s;",$1,$2)}')
-              eval $release_notes_line
-              end=$(expr ${end} - 1)
-              sed -n "${start},${end}p" RELEASE-NOTES.md >changelog.md
-              rm RELEASE-NOTES.md
-            else
-              MESSAGE=$(git log -1 --pretty=%B)
-              echo "commit MESSAGE: $MESSAGE"
-              echo $MESSAGE > changelog.md
-            fi
-            
-
+            MESSAGE=$(git log -1 --pretty=%B)
+            echo "commit MESSAGE: $MESSAGE"
+            echo 'Module Changelog' > changelog.md
+            echo $MESSAGE >> changelog.md
+            wget -O RELEASE-NOTES.md https://github.com/zerotier/ZeroTierOne/raw/dev/RELEASE-NOTES.md
+            release_notes_line=$(grep -nPo '\d{4}-\d{2}-\d{2} -- Version [\d.]+' RELEASE-NOTES.md|head -2|awk -F ':' '{print $1}'|awk BEGIN{RS=EOF}'{gsub(/\n/," ");print}'|awk '{printf("start=%s; end=%s;",$1,$2)}')
+            eval $release_notes_line
+            end=$(expr ${end} - 1)
+            echo " ===================" >>changelog.md
+            echo " Zerotier Changelog" >>changelog.md
+            sed -n "${start},${end}p" RELEASE-NOTES.md >>changelog.md
+            rm RELEASE-NOTES.md
             git add module.prop update_arm64.json update_arm.json changelog.md
-            git commit -m "update Zerotier version:${{env.VERSION}}"
+            git commit -m "update config"
             echo "COMMIT=1" >> $GITHUB_ENV
           else
             echo "no need commit"
@@ -125,38 +124,38 @@ jobs:
           mv zerotier-one-arm64 zerotier-one
           echo 'updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/main/update_arm64.json' >>module.prop
           ls -la
-          bash build.sh ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
+          bash build.sh ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
           mv -f zerotier-one-arm zerotier-one
           mv -f curl bin/curl
           sed -i "s/update_arm64/update_arm/g" module.prop
-          bash build.sh ZeroTierForKSU-arm-${{ env.VERSION }}.zip
+          bash build.sh ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ZeroTierForKSU
           path: |
-            ./ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
-            ./ZeroTierForKSU-arm-${{ env.VERSION }}.zip
+            ./ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
+            ./ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
 
       - name: Schedule Release
         uses: softprops/action-gh-release@v2
         if: github.event_name == 'schedule'  
         with:
           body_path: changelog.md
-          tag_name: ${{ env.VERSION }}
-          name: ZeroTierForKSU-${{ env.VERSION }}
+          tag_name: ${{ env.MODULE_VERSION }}
+          name: ZeroTierForKSU-${{ env.MODULE_VERSION }}
           files: |
-            ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
-            ZeroTierForKSU-arm-${{ env.VERSION }}.zip
+            ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
+            ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
 
       - name: Manual Release
         uses: softprops/action-gh-release@v2
         if: github.event_name == 'workflow_dispatch'
         with:
           generate_release_notes: true
-          tag_name: ${{ env.VERSION }}
-          name: ZeroTierForKSU-${{ env.VERSION }}
+          tag_name: ${{ env.MODULE_VERSION }}
+          name: ZeroTierForKSU-${{ env.MODULE_VERSION }}
           files: |
-            ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
-            ZeroTierForKSU-arm-${{ env.VERSION }}.zip
+            ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
+            ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
diff --git a/changelog_dev.md b/changelog_dev.md
@@ -1 +1 @@
-修复国际化
+更新工作流
diff --git a/ui-src/package.json b/ui-src/package.json
@@ -6,10 +6,10 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "postinstall": "patch-package",
     "devbuild": "vite build",
+    "postinstall": "patch-package",
     "predevbuild": "if exist %cd%\\dist.zip del %cd%\\dist.zip",
-    "postdevbuild": "7z u dist.zip ./dist/* & adb -s 192.168.10.237:46713 push %cd%\\dist.zip /sdcard/Download/dist/"
+    "postdevbuild": "7z u dist.zip ./dist/* & adb -s 192.168.10.155:46005 push %cd%\\dist.zip /sdcard/Download/dist/"
   },
   "dependencies": {
     "buffer": "^6.0.3",

diff --git a/update_arm64_dev.json b/update_arm64_dev.json
@@ -1 +1 @@
-{"version":"1.14.1","versionCode":10447,"zipUrl":"https://github.com/powerAn2020/ZeroTierForKSU/actions/runs/11188848765/artifacts/2018215225","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}
+{"version":"1.14.1","versionCode":10449,"zipUrl":"https://github.com/powerAn2020/ZeroTierForKSU/actions/runs/11190203396/artifacts/2018513466","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}
diff --git a/update_arm_dev.json b/update_arm_dev.json
@@ -1 +1 @@
-{"version":"1.14.1","versionCode":10447,"zipUrl":"https://github.com/powerAn2020/ZeroTierForKSU/actions/runs/11188848765/artifacts/2018215256","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}
+{"version":"1.14.1","versionCode":10449,"zipUrl":"","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version":"1.14.1","versionCode":10447,"zipUrl":"https://github.com/powerAn2020/ZeroTierForKSU/actions/runs/11188848765/artifacts/2018215225","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}
		{"version":"1.14.1","versionCode":10449,"zipUrl":"https://github.com/powerAn2020/ZeroTierForKSU/actions/runs/11190203396/artifacts/2018513466","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}