From f5b4cdf696933e52bcd75a6f6070378091d9bac2 Mon Sep 17 00:00:00 2001 From: powerAn <25736019+powerAn2020@users.noreply.github.com> Date: Thu, 18 Apr 2024 15:19:32 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui-src/src/Setting.vue | 2 +- zerotier.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui-src/src/Setting.vue b/ui-src/src/Setting.vue index 0305cee..5ca4179 100644 --- a/ui-src/src/Setting.vue +++ b/ui-src/src/Setting.vue @@ -59,7 +59,7 @@ const onSelect = (action) => { defaultRoterMode.value = action.text; showToast(action.text) console.info(action) - if (action.text === '1') { + if (action.text == '1') { console.info('main表优先模式') execCmd('rm /data/adb/zerotier/ROUTER_RULE_NEW').then(v => { console.info(v) diff --git a/zerotier.sh b/zerotier.sh index 7bc543c..2a6d530 100644 --- a/zerotier.sh +++ b/zerotier.sh @@ -63,9 +63,9 @@ status_service() { autoStart=true fi - routerRuleNew=1 + routerRuleNew=0 if [ -f ${ROUTER_RULE_NEW} ];then - routerRuleNew=0 + routerRuleNew=1 fi firewall=true if [ ! -f "${ALLOW_9993}" ]; then From 49b8b717987b61e93aa276013e9dc237b4290e09 Mon Sep 17 00:00:00 2001 From: github action Date: Thu, 18 Apr 2024 07:20:13 +0000 Subject: [PATCH 02/17] update Zerotier version:1.12.2 --- changelog.md | 2 +- module.prop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 9d1f2d9..9da0dc9 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1 @@ -首次安装,监听服务未启用,需要手动重启的bug \ No newline at end of file +路由模式显示有问题 diff --git a/module.prop b/module.prop index 9c6be05..6ddc4b1 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=ZeroTierForKSU name=ZeroTier For KernelSU version=1.12.2 -versionCode=10321 +versionCode=10330 author=powerAn description=ZeroTier(1.12.2) with UI interface From d35b41a5d37ce22119e37eed1b029ae662582512 Mon Sep 17 00:00:00 2001 From: github action Date: Thu, 18 Apr 2024 07:23:12 +0000 Subject: [PATCH 03/17] update Zerotier version:1.12.2 --- update_arm.json | 2 +- update_arm64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/update_arm.json b/update_arm.json index c4da974..2ca2d45 100644 --- a/update_arm.json +++ b/update_arm.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10319,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/releases/download/1.12.2/ZeroTierForKSU-arm-1.12.2.zip","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/main/changelog.md"} +{"version":"1.12.2","versionCode":10330,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8733948566","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog.md"} diff --git a/update_arm64.json b/update_arm64.json index fc16859..2ca2d45 100644 --- a/update_arm64.json +++ b/update_arm64.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10319,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/releases/download/1.12.2/ZeroTierForKSU-arm64-1.12.2.zip","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/main/changelog.md"} +{"version":"1.12.2","versionCode":10330,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8733948566","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog.md"} From 8031a4da7ee0f477cfadee50f0a60e735a1ab265 Mon Sep 17 00:00:00 2001 From: powerAn <25736019+powerAn2020@users.noreply.github.com> Date: Thu, 18 Apr 2024 15:57:28 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zerotier.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zerotier.sh b/zerotier.sh index 2a6d530..7bc543c 100644 --- a/zerotier.sh +++ b/zerotier.sh @@ -63,9 +63,9 @@ status_service() { autoStart=true fi - routerRuleNew=0 + routerRuleNew=1 if [ -f ${ROUTER_RULE_NEW} ];then - routerRuleNew=1 + routerRuleNew=0 fi firewall=true if [ ! -f "${ALLOW_9993}" ]; then From 32a75c764fbb14c49adf2c78d6a69a4b6da6007f Mon Sep 17 00:00:00 2001 From: github action Date: Thu, 18 Apr 2024 07:58:06 +0000 Subject: [PATCH 05/17] update Zerotier version:1.12.2 --- changelog.md | 2 +- module.prop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 9da0dc9..03b679b 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1 @@ -路由模式显示有问题 +回滚 diff --git a/module.prop b/module.prop index 6ddc4b1..8f861a3 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=ZeroTierForKSU name=ZeroTier For KernelSU version=1.12.2 -versionCode=10330 +versionCode=10333 author=powerAn description=ZeroTier(1.12.2) with UI interface From d20212c34b23555c766c6ad00bb963626b0cebe1 Mon Sep 17 00:00:00 2001 From: github action Date: Thu, 18 Apr 2024 08:01:04 +0000 Subject: [PATCH 06/17] update Zerotier version:1.12.2 --- update_arm.json | 2 +- update_arm64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/update_arm.json b/update_arm.json index 2ca2d45..ecf7399 100644 --- a/update_arm.json +++ b/update_arm.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10330,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8733948566","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog.md"} +{"version":"1.12.2","versionCode":10333,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8734370195","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog.md"} diff --git a/update_arm64.json b/update_arm64.json index 2ca2d45..ecf7399 100644 --- a/update_arm64.json +++ b/update_arm64.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10330,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8733948566","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog.md"} +{"version":"1.12.2","versionCode":10333,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8734370195","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog.md"} From a190b59f6c8ebff7f069ddf307b292785687b9d4 Mon Sep 17 00:00:00 2001 From: powerAn <25736019+powerAn2020@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:38:51 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev_build.yml | 35 +++++++++++----------- .github/workflows/release.yml | 6 ++-- build.sh | 51 ++++++++++++++++++++++++++------- module_file | 16 +++++++++++ 4 files changed, 75 insertions(+), 33 deletions(-) create mode 100644 module_file diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index f119e7a..0b56432 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -66,16 +66,15 @@ jobs: git config --global user.email "action@example.com" MESSAGE=$(git log -1 --pretty=%B) echo "commit MESSAGE: $MESSAGE" - echo $MESSAGE > changelog.md + echo $MESSAGE > changelog_dev.md git config --global user.name "github action" - git add module.prop update_arm64.json update_arm.json changelog.md - git commit -m "update Zerotier version:${{env.VERSION}}" + git add changelog_dev.md echo "COMMIT=1" >> $GITHUB_ENV - name: Build Zerotier for arm64 run: | export PATH="$PWD/toolchain/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/bin/:${PATH}" - git clone https:///github.com/zerotier/ZeroTierOne.git --depth=1 -b ${{ env.VERSION }} + git clone https://github.com/zerotier/ZeroTierOne.git --depth=1 -b ${{ env.VERSION }} cp -rf ZeroTierOne ZeroTierOne_ARM cd ZeroTierOne make -j $(nproc) ZT_STATIC=1 ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=aarch64-none-linux-gnu-gcc CXX=aarch64-none-linux-gnu-g++ LDFLAGS="-s" @@ -98,41 +97,39 @@ jobs: - name: Generate module for arm64/arm run: | - rm -rf ZeroTierOne ZeroTierOne_ARM toolchain ui-src update_arm64.json update_arm.json build.sh + rm -rf ZeroTierOne ZeroTierOne_ARM toolchain ui-src update_arm64.json update_arm.json update_arm64_dev.json update_arm_dev.json build.sh changelog_dev.md mv zerotier-one-arm64 zerotier-one - echo 'updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm64.json' >>module.prop - ls -la - zip -r -o -X -ll ZeroTierForKSU-arm64-${{ env.VERSION }}.zip ./ -x '.git/*' -x '.gitignore' -x '.github/*' -x 'zerotier-one-arm' -x 'curl' + echo 'updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm64_dev.json' >>module.prop + ./build.sh ZeroTierForKSU-arm64-${{ env.VERSION }}.zip mv -f zerotier-one-arm zerotier-one mv -f curl bin/curl sed -i "s/update_arm64/update_arm/g" module.prop - zip -r -o -X -ll ZeroTierForKSU-arm-${{ env.VERSION }}.zip ./ -x '.git/*' -x '.gitignore' -x '.github/*' -x 'ZeroTierForKSU-arm64-${{ env.VERSION }}.zip' + ./build.sh ZeroTierForKSU-arm-${{ env.VERSION }}.zip - name: Upload artifact - uses: actions/upload-artifact@v3 + id: arm64-zip + uses: actions/upload-artifact@v4 with: name: ZeroTierForKSU-arm64-${{ env.VERSION }} path: ZeroTierForKSU-arm64-${{ env.VERSION }}.zip - - name: 输出 Artifact 下载地址 - run: | - echo "Artifact2 下载地址: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" - echo '{"version":"${{ env.VERSION }}","versionCode":'${{env.new_module_version}}',"zipUrl":"https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog.md"}' >update_arm64.json - - name: Upload artifact - uses: actions/upload-artifact@v3 + id: arm-zip + uses: actions/upload-artifact@v4 with: name: ZeroTierForKSU-arm-${{ env.VERSION }} path: ZeroTierForKSU-arm-${{ env.VERSION }}.zip - name: 输出 Artifact 下载地址 run: | - echo "Artifact2 下载地址: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" - echo '{"version":"${{ env.VERSION }}","versionCode":'${{env.new_module_version}}',"zipUrl":"https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog.md"}' >update_arm.json + 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 - name: update json run: | - git add update_arm64.json update_arm.json + git add update_arm64_dev.json update_arm_dev.json changelog_dev.md module.prop git commit -m "update Zerotier version:${{env.VERSION}}" echo "COMMIT=1" >> $GITHUB_ENV diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 20dc200..8ca1f6f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,13 +28,11 @@ jobs: echo "${{ github.action_path }}" latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/stunnel/static-curl/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) module_latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/powerAn2020/ZeroTierOneForKSU/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) - if [ "$latest_version" = "$module_latest_version" ]; then + zerotier_latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/zerotier/ZeroTierOne/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) + if [ "$zerotier_latest_version" = "$module_latest_version" -a "${{github.event_name }}" = "schedule"]; then exit 0 fi - zerotier_latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/zerotier/ZeroTierOne/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) - echo "VERSION=$zerotier_latest_version" >> $GITHUB_ENV - download_link="https://github.com/stunnel/static-curl/releases/download/${latest_version}/curl-linux-aarch64-${latest_version}.tar.xz" echo ${download_link} wget -O curl.tar.xz ${download_link} diff --git a/build.sh b/build.sh index c269a0b..e5f50b7 100644 --- a/build.sh +++ b/build.sh @@ -1,13 +1,44 @@ #!/bin/bash -SH_DIR=$(cd "$(dirname "$0")";pwd) +baseDIR=$(cd "$(dirname "$0")" || exit; pwd) -if [ -f ${SH_DIR}/ZeroTierForKSU.zip ];then - rm ${SH_DIR}/ZeroTierForKSU.zip +if [ -f "${baseDIR}/$1" ]; then + rm "${baseDIR}/$1" fi -cd ${SH_DIR}/ui-src -npm i -npm audit fix -npm run build -mv -f build ${SH_DIR}/webroot -cd ${SH_DIR} -zip -r -o -X -ll ZeroTierForKSU.zip ./ -x '.git/*' -x '.gitignore' -x '.github/*' -x '.vscode/*' -x 'ui-src' -x 'build.sh' -x 'update.json' + +moduleFile="${baseDIR}/module_file" + +cd ${baseDIR} +# 构建zip命令 +zipCmd="zip -r -o -X $1 ./ " + +# 遍历目录下的文件,如果不在排除列表中则添加到zip命令中 +for file in $(ls -a "$baseDIR"); do + # echo "---${file##*/}---" + # filename=$(basename "$file") + # echo "===$filename===" + if [[ "${file}" == ".." || "${file}" == "." ]]; then + continue; + fi + add="A" + while read white;do + if [[ "${white}" == "${file}" ]]; then + # echo "===$white *=* $file======"; + add="N"; + break; + fi + done < $moduleFile + + if [[ "$add" == "A" ]]; then + if [ -d $file ];then + zipCmd="${zipCmd} -x '${file}/*'" + else + zipCmd="${zipCmd} -x '$file'" + fi + fi +done + +# 打印最终的zip命令 +echo "$zipCmd" + +# 执行zip命令 +eval "$zipCmd" diff --git a/module_file b/module_file new file mode 100644 index 0000000..a9bac3c --- /dev/null +++ b/module_file @@ -0,0 +1,16 @@ +bin +META-INF +webroot +api.sh +customize.sh +module.prop +README.md +service.sh +uninstall.sh +zerotier.inotify +zerotier.sh +zerotier-cli +zerotier-idtool +zerotier-one +LICENSE +changelog.md \ No newline at end of file From c92564e7f5d3b161c22206955442dbb320bcf41e Mon Sep 17 00:00:00 2001 From: powerAn <25736019+powerAn2020@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:47:28 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev_build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index 0b56432..bb0b6de 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -99,12 +99,13 @@ jobs: run: | rm -rf ZeroTierOne ZeroTierOne_ARM toolchain ui-src update_arm64.json update_arm.json update_arm64_dev.json update_arm_dev.json build.sh changelog_dev.md mv zerotier-one-arm64 zerotier-one + ls -la echo 'updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm64_dev.json' >>module.prop - ./build.sh ZeroTierForKSU-arm64-${{ env.VERSION }}.zip + sh build.sh ZeroTierForKSU-arm64-${{ env.VERSION }}.zip mv -f zerotier-one-arm zerotier-one mv -f curl bin/curl sed -i "s/update_arm64/update_arm/g" module.prop - ./build.sh ZeroTierForKSU-arm-${{ env.VERSION }}.zip + sh build.sh ZeroTierForKSU-arm-${{ env.VERSION }}.zip - name: Upload artifact id: arm64-zip From 6736e1900444453c5fc291f9a5def5a929375c59 Mon Sep 17 00:00:00 2001 From: powerAn <25736019+powerAn2020@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:53:03 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index bb0b6de..945a29c 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -97,7 +97,7 @@ jobs: - name: Generate module for arm64/arm run: | - rm -rf ZeroTierOne ZeroTierOne_ARM toolchain ui-src update_arm64.json update_arm.json update_arm64_dev.json update_arm_dev.json build.sh changelog_dev.md + # rm -rf ZeroTierOne ZeroTierOne_ARM toolchain ui-src update_arm64.json update_arm.json update_arm64_dev.json update_arm_dev.json build.sh changelog_dev.md mv zerotier-one-arm64 zerotier-one ls -la echo 'updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm64_dev.json' >>module.prop From cd43ecea931d8a17e56bdc264c5d63c13ca783cd Mon Sep 17 00:00:00 2001 From: powerAn <25736019+powerAn2020@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:57:52 +0800 Subject: [PATCH 10/17] test --- .github/workflows/dev_build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index 945a29c..2b91be0 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -24,7 +24,7 @@ jobs: env: DEBIAN_FRONTEND: noninteractive run: | - sudo apt install -y xz-utils make git wget zip + sudo apt install -y xz-utils make git wget zip bash echo "${{ github.action_path }}" latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/stunnel/static-curl/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) module_latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/powerAn2020/ZeroTierOneForKSU/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) @@ -32,9 +32,7 @@ jobs: exit 0 fi zerotier_latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/zerotier/ZeroTierOne/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) - echo "VERSION=$zerotier_latest_version" >> $GITHUB_ENV - download_link="https://github.com/stunnel/static-curl/releases/download/${latest_version}/curl-linux-aarch64-${latest_version}.tar.xz" echo ${download_link} wget -O curl.tar.xz ${download_link} @@ -101,11 +99,11 @@ jobs: mv zerotier-one-arm64 zerotier-one ls -la echo 'updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm64_dev.json' >>module.prop - sh build.sh ZeroTierForKSU-arm64-${{ env.VERSION }}.zip + bash build.sh ZeroTierForKSU-arm64-${{ env.VERSION }}.zip mv -f zerotier-one-arm zerotier-one mv -f curl bin/curl sed -i "s/update_arm64/update_arm/g" module.prop - sh build.sh ZeroTierForKSU-arm-${{ env.VERSION }}.zip + bash build.sh ZeroTierForKSU-arm-${{ env.VERSION }}.zip - name: Upload artifact id: arm64-zip From 26236e9e42733fea7e0c4881c9541b7aefcc159b Mon Sep 17 00:00:00 2001 From: github action Date: Thu, 18 Apr 2024 15:01:26 +0000 Subject: [PATCH 11/17] update Zerotier version:1.12.2 --- changelog_dev.md | 1 + module.prop | 3 ++- update_arm64_dev.json | 1 + update_arm_dev.json | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelog_dev.md create mode 100644 update_arm64_dev.json create mode 100644 update_arm_dev.json diff --git a/changelog_dev.md b/changelog_dev.md new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/changelog_dev.md @@ -0,0 +1 @@ +test diff --git a/module.prop b/module.prop index 8f861a3..4f75203 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,7 @@ id=ZeroTierForKSU name=ZeroTier For KernelSU version=1.12.2 -versionCode=10333 +versionCode=10339 author=powerAn description=ZeroTier(1.12.2) with UI interface +updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm_dev.json diff --git a/update_arm64_dev.json b/update_arm64_dev.json new file mode 100644 index 0000000..059f229 --- /dev/null +++ b/update_arm64_dev.json @@ -0,0 +1 @@ +{"version":"1.12.2","versionCode":10339,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740179829/artifacts/1426325877","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} diff --git a/update_arm_dev.json b/update_arm_dev.json new file mode 100644 index 0000000..372a403 --- /dev/null +++ b/update_arm_dev.json @@ -0,0 +1 @@ +{"version":"1.12.2","versionCode":10339,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740179829/artifacts/1426325959","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} From e4dce04f3fedbaeebffccbf0c3707cefb306e43f Mon Sep 17 00:00:00 2001 From: powerAn <25736019+powerAn2020@users.noreply.github.com> Date: Thu, 18 Apr 2024 23:19:32 +0800 Subject: [PATCH 12/17] test --- .github/workflows/dev_build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index 2b91be0..50b63ad 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -111,13 +111,16 @@ jobs: with: name: ZeroTierForKSU-arm64-${{ env.VERSION }} path: ZeroTierForKSU-arm64-${{ env.VERSION }}.zip - + retention-days: 7 + compression-level: 0 - name: Upload artifact id: arm-zip uses: actions/upload-artifact@v4 with: name: ZeroTierForKSU-arm-${{ env.VERSION }} path: ZeroTierForKSU-arm-${{ env.VERSION }}.zip + retention-days: 7 + compression-level: 0 - name: 输出 Artifact 下载地址 run: | From 941a81f4a1c2146b2bc48a7f5922919ae72d77df Mon Sep 17 00:00:00 2001 From: github action Date: Thu, 18 Apr 2024 15:23:15 +0000 Subject: [PATCH 13/17] update Zerotier version:1.12.2 --- module.prop | 2 +- update_arm64_dev.json | 2 +- update_arm_dev.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module.prop b/module.prop index 4f75203..9279132 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=ZeroTierForKSU name=ZeroTier For KernelSU version=1.12.2 -versionCode=10339 +versionCode=10341 author=powerAn description=ZeroTier(1.12.2) with UI interface updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm_dev.json diff --git a/update_arm64_dev.json b/update_arm64_dev.json index 059f229..b3e4d03 100644 --- a/update_arm64_dev.json +++ b/update_arm64_dev.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10339,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740179829/artifacts/1426325877","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} +{"version":"1.12.2","versionCode":10341,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740525346/artifacts/1426411877","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} diff --git a/update_arm_dev.json b/update_arm_dev.json index 372a403..85da4a5 100644 --- a/update_arm_dev.json +++ b/update_arm_dev.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10339,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740179829/artifacts/1426325959","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} +{"version":"1.12.2","versionCode":10341,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740525346/artifacts/1426411939","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} From 7ef0b19b303858463edf7c90afcba48516270e42 Mon Sep 17 00:00:00 2001 From: powerAn <25736019+powerAn2020@users.noreply.github.com> Date: Thu, 18 Apr 2024 23:29:14 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85=E5=A5=97=E5=8E=8B=E7=BC=A9=E5=8C=85?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev_build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index 50b63ad..7c287f3 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -100,27 +100,29 @@ jobs: 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 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 + - name: Upload artifact id: arm64-zip uses: actions/upload-artifact@v4 with: name: ZeroTierForKSU-arm64-${{ env.VERSION }} - path: ZeroTierForKSU-arm64-${{ env.VERSION }}.zip + path: ./ZeroTierForKSU-arm64-${{ env.VERSION }}/* retention-days: 7 - compression-level: 0 + - name: Upload artifact id: arm-zip uses: actions/upload-artifact@v4 with: name: ZeroTierForKSU-arm-${{ env.VERSION }} - path: ZeroTierForKSU-arm-${{ env.VERSION }}.zip + path: ./ZeroTierForKSU-arm-${{ env.VERSION }}/* retention-days: 7 - compression-level: 0 - name: 输出 Artifact 下载地址 run: | From e282f617c6a380a14499ce90a4d2727486deddfd Mon Sep 17 00:00:00 2001 From: github action Date: Thu, 18 Apr 2024 15:32:52 +0000 Subject: [PATCH 15/17] update Zerotier version:1.12.2 --- changelog_dev.md | 2 +- module.prop | 2 +- update_arm64_dev.json | 2 +- update_arm_dev.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changelog_dev.md b/changelog_dev.md index 9daeafb..b2c0143 100644 --- a/changelog_dev.md +++ b/changelog_dev.md @@ -1 +1 @@ -test +尝试解决压缩包套压缩包的问题 diff --git a/module.prop b/module.prop index 9279132..dc4a17b 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=ZeroTierForKSU name=ZeroTier For KernelSU version=1.12.2 -versionCode=10341 +versionCode=10343 author=powerAn description=ZeroTier(1.12.2) with UI interface updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm_dev.json diff --git a/update_arm64_dev.json b/update_arm64_dev.json index b3e4d03..ffdb520 100644 --- a/update_arm64_dev.json +++ b/update_arm64_dev.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10341,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740525346/artifacts/1426411877","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} +{"version":"1.12.2","versionCode":10343,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740666064/artifacts/1426448721","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} diff --git a/update_arm_dev.json b/update_arm_dev.json index 85da4a5..685e8e7 100644 --- a/update_arm_dev.json +++ b/update_arm_dev.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10341,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740525346/artifacts/1426411939","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} +{"version":"1.12.2","versionCode":10343,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740666064/artifacts/1426448771","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} From 5348e97c2492130b6053029981676e061a94aaa4 Mon Sep 17 00:00:00 2001 From: powerAn <25736019+powerAn2020@users.noreply.github.com> Date: Thu, 18 Apr 2024 23:59:12 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0dev=E6=A0=87=E8=AF=86,=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev_build.yml | 9 +++------ ui-src/src/Setting.vue | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml index 7c287f3..6bff4dd 100644 --- a/.github/workflows/dev_build.yml +++ b/.github/workflows/dev_build.yml @@ -27,10 +27,6 @@ jobs: sudo apt install -y xz-utils make git wget zip bash echo "${{ github.action_path }}" latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/stunnel/static-curl/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) - module_latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/powerAn2020/ZeroTierOneForKSU/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) - if [ "$latest_version" = "$module_latest_version" ]; then - exit 0 - fi zerotier_latest_version=$(wget --no-check-certificate -qO- "https://api.github.com/repos/zerotier/ZeroTierOne/releases" | grep "tag_name" | grep -oE "[0-9.]*" | head -1) echo "VERSION=$zerotier_latest_version" >> $GITHUB_ENV download_link="https://github.com/stunnel/static-curl/releases/download/${latest_version}/curl-linux-aarch64-${latest_version}.tar.xz" @@ -60,7 +56,7 @@ jobs: echo "version=${{ env.VERSION }}" >>module.prop echo "versionCode=${versionCode}" >>module.prop echo 'author=powerAn' >>module.prop - echo 'description=ZeroTier(${{ env.VERSION }}) with UI interface' >>module.prop + echo 'description=ZeroTier(${{ env.VERSION }}) with UI interface (DEV)' >>module.prop git config --global user.email "action@example.com" MESSAGE=$(git log -1 --pretty=%B) echo "commit MESSAGE: $MESSAGE" @@ -115,9 +111,10 @@ jobs: name: ZeroTierForKSU-arm64-${{ env.VERSION }} path: ./ZeroTierForKSU-arm64-${{ env.VERSION }}/* retention-days: 7 - + - name: Upload artifact id: arm-zip + # v2版本好像不会压缩包套压缩包,还没试 uses: actions/upload-artifact@v4 with: name: ZeroTierForKSU-arm-${{ env.VERSION }} diff --git a/ui-src/src/Setting.vue b/ui-src/src/Setting.vue index 5ca4179..574995a 100644 --- a/ui-src/src/Setting.vue +++ b/ui-src/src/Setting.vue @@ -30,6 +30,7 @@ + From 8dfdabbb28d2e0735921d9c70afbb1ec016cd6d2 Mon Sep 17 00:00:00 2001 From: github action Date: Thu, 18 Apr 2024 16:03:09 +0000 Subject: [PATCH 17/17] update Zerotier version:1.12.2 --- changelog_dev.md | 2 +- module.prop | 4 ++-- update_arm64_dev.json | 2 +- update_arm_dev.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/changelog_dev.md b/changelog_dev.md index b2c0143..5999aa5 100644 --- a/changelog_dev.md +++ b/changelog_dev.md @@ -1 +1 @@ -尝试解决压缩包套压缩包的问题 +清理代码,增加dev标识,设置页面增加代码仓库 diff --git a/module.prop b/module.prop index dc4a17b..6a5efdd 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=ZeroTierForKSU name=ZeroTier For KernelSU version=1.12.2 -versionCode=10343 +versionCode=10345 author=powerAn -description=ZeroTier(1.12.2) with UI interface +description=ZeroTier(1.12.2) with UI interface (DEV) updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm_dev.json diff --git a/update_arm64_dev.json b/update_arm64_dev.json index ffdb520..5686db4 100644 --- a/update_arm64_dev.json +++ b/update_arm64_dev.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10343,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740666064/artifacts/1426448721","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} +{"version":"1.12.2","versionCode":10345,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8741063431/artifacts/1426553784","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} diff --git a/update_arm_dev.json b/update_arm_dev.json index 685e8e7..0ee0305 100644 --- a/update_arm_dev.json +++ b/update_arm_dev.json @@ -1 +1 @@ -{"version":"1.12.2","versionCode":10343,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8740666064/artifacts/1426448771","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"} +{"version":"1.12.2","versionCode":10345,"zipUrl":"https://github.com/powerAn2020/ZeroTierOneForKSU/actions/runs/8741063431/artifacts/1426553917","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}