Skip to content

Commit 76ffae8

Browse files
powerAn2020powerAn2020
authored
Merge pull request #26 from powerAn2020/dev
更新工作流
2 parents 56d0afd + ce603a8 commit 76ffae8

File tree

6 files changed

+57
-46
lines changed

6 files changed

+57
-46
lines changed

‎.github/workflows/dev_build.yml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ jobs:
6262
module_versionCode=$(grep -w 'versionCode' module.prop |awk -F'=' '{print $2}')
6363
echo "Scheduled event triggered this workflow"
6464
versionCode=$(expr 10000 + $(git rev-list --count HEAD) + 200)
65-
echo "new_module_version=$versionCode" >> $GITHUB_ENV
65+
echo "MODULE_VERSION=$versionCode" >> $GITHUB_ENV
6666
echo 'id=ZeroTierForKSU' >module.prop
6767
echo 'name=ZeroTier For KernelSU' >>module.prop
68-
echo "version=ZeroTier Version->${{ env.VERSION }} & module Version->${versionCode}" >>module.prop
68+
echo "version=${versionCode}" >>module.prop
6969
echo "versionCode=${versionCode}" >>module.prop
7070
echo 'author=powerAn2020' >>module.prop
7171
echo 'description=ZeroTier(${{ env.VERSION }}) with UI interface (DEV)' >>module.prop
@@ -107,21 +107,21 @@ jobs:
107107
mv zerotier-one-arm64 zerotier-one
108108
ls -la
109109
echo 'updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/update_arm64_dev.json' >>module.prop
110-
bash build.sh ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
111-
unzip -d ZeroTierForKSU-arm64-${{ env.VERSION }} ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
110+
bash build.sh ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
111+
unzip -d ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }} ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
112112
mv -f zerotier-one-arm zerotier-one
113113
mv -f curl bin/curl
114114
sed -i "s/update_arm64/update_arm/g" module.prop
115-
bash build.sh ZeroTierForKSU-arm-${{ env.VERSION }}.zip
116-
unzip -d ZeroTierForKSU-arm-${{ env.VERSION }} ZeroTierForKSU-arm-${{ env.VERSION }}.zip
115+
bash build.sh ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
116+
unzip -d ZeroTierForKSU-arm-${{ env.MODULE_VERSION }} ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
117117
118118
119119
- name: Upload artifact
120120
id: arm64-zip
121121
uses: actions/upload-artifact@v4
122122
with:
123-
name: ZeroTierForKSU-arm64-${{ env.VERSION }}
124-
path: ./ZeroTierForKSU-arm64-${{ env.VERSION }}/*
123+
name: ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}
124+
path: ./ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}/*
125125
retention-days: 7
126126

127127
- name: Upload artifact
@@ -137,8 +137,8 @@ jobs:
137137
run: |
138138
echo "Artifact1 下载地址: ${{ steps.arm-zip.outputs.artifact-url }}"
139139
echo "Artifact2 下载地址: ${{ steps.arm64-zip.outputs.artifact-url }}"
140-
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
141-
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
140+
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
141+
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
142142
143143
- name: update json
144144
run: |
@@ -151,5 +151,17 @@ jobs:
151151
if: ${{ env.COMMIT == '1' }}
152152
with:
153153
github_token: ${{ secrets.GITHUB_TOKEN }}
154-
branch: dev
154+
branch: dev
155+
156+
- name: Manual Release
157+
uses: softprops/action-gh-release@v2
158+
if: github.event_name == 'workflow_dispatch'
159+
with:
160+
prerelease: true
161+
generate_release_notes: true
162+
tag_name: ${{ env.MODULE_VERSION }}
163+
name: ZeroTierForKSU-dev-${{ env.MODULE_VERSION }}
164+
files: |
165+
ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
166+
ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
155167

‎.github/workflows/release.yml

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
ref: main
2121
fetch-depth: 0
@@ -56,32 +56,31 @@ jobs:
5656
if [[ "${{ env.VERSION }}" != "${module_version}" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
5757
echo "Scheduled event triggered this workflow"
5858
versionCode=$(expr 10000 + $(git rev-list --count HEAD) + 200)
59+
echo "MODULE_VERSION=$versionCode" >> $GITHUB_ENV
5960
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
6061
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
6162
echo 'id=ZeroTierForKSU' >module.prop
6263
echo 'name=ZeroTier For KernelSU' >>module.prop
63-
echo "version=ZeroTier Version->${{ env.VERSION }} & module Version->${versionCode}" >>module.prop
64+
echo "version=${versionCode}" >>module.prop
6465
echo "versionCode=${versionCode}" >>module.prop
6566
echo 'author=powerAn2020' >>module.prop
6667
echo 'description=ZeroTier(${{ env.VERSION }}) with UI interface' >>module.prop
6768
git config --global user.email "action@example.com"
6869
git config --global user.name "github action"
69-
if [[ "${{ github.event_name }}" == "schedule" ]]; then
70-
wget -O RELEASE-NOTES.md https://github.com/zerotier/ZeroTierOne/raw/dev/RELEASE-NOTES.md
71-
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)}')
72-
eval $release_notes_line
73-
end=$(expr ${end} - 1)
74-
sed -n "${start},${end}p" RELEASE-NOTES.md >changelog.md
75-
rm RELEASE-NOTES.md
76-
else
77-
MESSAGE=$(git log -1 --pretty=%B)
78-
echo "commit MESSAGE: $MESSAGE"
79-
echo $MESSAGE > changelog.md
80-
fi
81-
82-
70+
MESSAGE=$(git log -1 --pretty=%B)
71+
echo "commit MESSAGE: $MESSAGE"
72+
echo 'Module Changelog' > changelog.md
73+
echo $MESSAGE >> changelog.md
74+
wget -O RELEASE-NOTES.md https://github.com/zerotier/ZeroTierOne/raw/dev/RELEASE-NOTES.md
75+
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)}')
76+
eval $release_notes_line
77+
end=$(expr ${end} - 1)
78+
echo " ===================" >>changelog.md
79+
echo " Zerotier Changelog" >>changelog.md
80+
sed -n "${start},${end}p" RELEASE-NOTES.md >>changelog.md
81+
rm RELEASE-NOTES.md
8382
git add module.prop update_arm64.json update_arm.json changelog.md
84-
git commit -m "update Zerotier version:${{env.VERSION}}"
83+
git commit -m "update config"
8584
echo "COMMIT=1" >> $GITHUB_ENV
8685
else
8786
echo "no need commit"
@@ -125,38 +124,38 @@ jobs:
125124
mv zerotier-one-arm64 zerotier-one
126125
echo 'updateJson=https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/main/update_arm64.json' >>module.prop
127126
ls -la
128-
bash build.sh ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
127+
bash build.sh ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
129128
mv -f zerotier-one-arm zerotier-one
130129
mv -f curl bin/curl
131130
sed -i "s/update_arm64/update_arm/g" module.prop
132-
bash build.sh ZeroTierForKSU-arm-${{ env.VERSION }}.zip
131+
bash build.sh ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
133132
134133
- name: Upload artifact
135-
uses: actions/upload-artifact@v3
134+
uses: actions/upload-artifact@v4
136135
with:
137136
name: ZeroTierForKSU
138137
path: |
139-
./ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
140-
./ZeroTierForKSU-arm-${{ env.VERSION }}.zip
138+
./ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
139+
./ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
141140
142141
- name: Schedule Release
143142
uses: softprops/action-gh-release@v2
144143
if: github.event_name == 'schedule'
145144
with:
146145
body_path: changelog.md
147-
tag_name: ${{ env.VERSION }}
148-
name: ZeroTierForKSU-${{ env.VERSION }}
146+
tag_name: ${{ env.MODULE_VERSION }}
147+
name: ZeroTierForKSU-${{ env.MODULE_VERSION }}
149148
files: |
150-
ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
151-
ZeroTierForKSU-arm-${{ env.VERSION }}.zip
149+
ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
150+
ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip
152151
153152
- name: Manual Release
154153
uses: softprops/action-gh-release@v2
155154
if: github.event_name == 'workflow_dispatch'
156155
with:
157156
generate_release_notes: true
158-
tag_name: ${{ env.VERSION }}
159-
name: ZeroTierForKSU-${{ env.VERSION }}
157+
tag_name: ${{ env.MODULE_VERSION }}
158+
name: ZeroTierForKSU-${{ env.MODULE_VERSION }}
160159
files: |
161-
ZeroTierForKSU-arm64-${{ env.VERSION }}.zip
162-
ZeroTierForKSU-arm-${{ env.VERSION }}.zip
160+
ZeroTierForKSU-arm64-${{ env.MODULE_VERSION }}.zip
161+
ZeroTierForKSU-arm-${{ env.MODULE_VERSION }}.zip

‎changelog_dev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
修复国际化
1+
更新工作流

‎ui-src/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"scripts": {
77
"dev": "vite",
88
"build": "vite build",
9-
"postinstall": "patch-package",
109
"devbuild": "vite build",
10+
"postinstall": "patch-package",
1111
"predevbuild": "if exist %cd%\\dist.zip del %cd%\\dist.zip",
12-
"postdevbuild": "7z u dist.zip ./dist/* & adb -s 192.168.10.237:46713 push %cd%\\dist.zip /sdcard/Download/dist/"
12+
"postdevbuild": "7z u dist.zip ./dist/* & adb -s 192.168.10.155:46005 push %cd%\\dist.zip /sdcard/Download/dist/"
1313
},
1414
"dependencies": {
1515
"buffer": "^6.0.3",

‎update_arm64_dev.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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"}
1+
{"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"}

‎update_arm_dev.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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"}
1+
{"version":"1.14.1","versionCode":10449,"zipUrl":"","changelog":"https://raw.githubusercontent.com/powerAn2020/ZeroTierOneForKSU/dev/changelog_dev.md"}

0 commit comments

Comments
 (0)