Skip to content

Commit 903ca52

Browse files
KangLinKangLin
committed
CI: add arm64 in msvc.yml
1 parent 54bdd9c commit 903ca52

File tree

11 files changed

+95
-61
lines changed

11 files changed

+95
-61
lines changed

‎.github/workflows/android.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
BUILD_TYPE: [Release]
1717
qt_arch: [android_arm64_v8a, android_x86_64]
18-
qt_version: [6.8.2]
18+
qt_version: [6.9.2]
1919
include:
2020
- qt_arch: android_arm64_v8a
2121
VCPKG_TARGET_TRIPLET: arm64-android

‎.github/workflows/build.yml‎

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: build
55
env:
66
artifact_path: artifact_path
77
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8-
SerialPortAssistant_VERSION: v0.5.31
8+
SerialPortAssistant_VERSION: 0.5.31
99

1010
on:
1111
push:
@@ -121,38 +121,64 @@ jobs:
121121
echo "" >> ${{github.workspace}}/Release.md
122122
echo "[:us: Change log](ChangeLog.md)" >> ${{github.workspace}}/Release.md
123123
echo "" >> ${{github.workspace}}/Release.md
124-
echo "[Instructions for installing the package](README.md#Instructions-for-installing-the-package)" >> ${{github.workspace}}/Release.md
125124
126125
- name: Make relase file
127126
if: ${{ startsWith(github.ref, 'refs/tags/') }}
128127
run: |
129-
echo "[:cn: 修改日志](https://github.com/KangLin/SerialPortAssistant/blob/${{env.SerialPortAssistant_VERSION}}/ChangeLog_zh_CN.md)" > ${{github.workspace}}/Release.md
130-
echo "[:us: Change log](https://github.com/KangLin/SerialPortAssistant/blob/${{env.SerialPortAssistant_VERSION}}/ChangeLog.md)" >> ${{github.workspace}}/Release.md
128+
echo "[:cn: 修改日志](https://github.com/KangLin/SerialPortAssistant/blob/v${{env.SerialPortAssistant_VERSION}}/ChangeLog_zh_CN.md)" > ${{github.workspace}}/Release.md
129+
echo "[:us: Change log](https://github.com/KangLin/SerialPortAssistant/blob/v${{env.SerialPortAssistant_VERSION}}/ChangeLog.md)" >> ${{github.workspace}}/Release.md
131130
echo "" >> ${{github.workspace}}/Release.md
132-
echo "[Instructions for installing the package](https://github.com/KangLin/SerialPortAssistant/blob/${{env.SerialPortAssistant_VERSION}}/README.md#Instructions-for-installing-the-package)" >> ${{github.workspace}}/Release.md
133-
echo "[安装包说明](https://github.com/KangLin/SerialPortAssistant/blob/${{env.SerialPortAssistant_VERSION}}/README_zh_CN.md#安装包说明)" >> ${{github.workspace}}/Release.md
134-
131+
135132
- name: md5
136133
run: |
137134
echo "" >> ${{github.workspace}}/Release.md
138-
echo "File checksum:" >> ${{github.workspace}}/Release.md
139-
echo "|File|Checksum(md5)|" >> ${{github.workspace}}/Release.md
140-
echo "| :- | :- |" >> ${{github.workspace}}/Release.md
141-
135+
echo "## File checksum:" >> ${{github.workspace}}/CheckSum.md
136+
echo "" >> ${{github.workspace}}/CheckSum.md
137+
echo "|File|Checksum(md5)|Checksum(sha256)|" >> ${{github.workspace}}/CheckSum.md
138+
echo "| :- | :- |:-|" >> ${{github.workspace}}/CheckSum.md
142139
cd ${{ env.artifact_path }}
143140
for file in *
144141
do
145142
echo "$file"
146143
if [ -f $file ]; then
147144
if [ "${file##*.}" != "xml" ] && [ "${file##*.}" != "json" ]; then
148-
md5sum $file > $file.md5sum
149-
awk '{print "|", $2, "|", $1, "|"}' ${file}.md5sum >> ${{github.workspace}}/Release.md
145+
SumMd5=`md5sum $file | awk '{print "|", $2, "|", $1, "|"}'`
146+
Sum256=`sha256sum $file | awk '{print $1, "|"}'`
147+
echo "${SumMd5}${Sum256}" >> ${{github.workspace}}/CheckSum.md
150148
fi
151149
else
152150
rm -fr $file
153151
fi
154152
done
155153
154+
- name: Add download
155+
run: |
156+
export BRANCH_NAME=${{ github.ref_name }}
157+
if [ "${{ github.ref_name }}" == "master" ]; then
158+
export BRANCH_NAME=test_${{ github.ref_name }}
159+
fi
160+
echo "## Download:" >> ${{github.workspace}}/Release.md
161+
echo "" >> ${{github.workspace}}/Release.md
162+
echo "| | x86-64 (64-bit) | x86-32 (32-bit) | AArch64 (ARM64) | ARMv7 (32-bit) |Remark|" >> ${{github.workspace}}/Release.md
163+
echo "|:- | :-------------- | :-------------- | :-------------- | :------------- |:-----|" >> ${{github.workspace}}/Release.md
164+
echo "|Windows xp SP3| |[EXE](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_windows_xp_x86_Setup.exe)||||" >> ${{github.workspace}}/Release.md
165+
echo "|Windows 7 SP1 or later|[EXE](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_win64_msvc2022_64_qt6.9.2_Setup.exe)|[EXE](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe)|[EXE](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_win64_msvc2022_arm64_qt6.9.2_Setup.exe) | ||" >> ${{github.workspace}}/Release.md
166+
echo "|Android|[APK](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_android_x86_64_qt6.9.2_Release.apk) | |[APK](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_android_arm64_v8a_qt6.9.2_Release.apk)| |Experiment|" >> ${{github.workspace}}/Release.md
167+
echo "|Macos|[App zip](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_macos-13.zip) [dmg](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_macos-13.dmg)||[App zip](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_macos-14.zip) [dmg](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_macos-14.dmg)||Experiment|" >> ${{github.workspace}}/Release.md
168+
echo "|Linux|[AppImage](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_Linux_x86_64.AppImage)| |[AppImage](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_Linux_aarch64.AppImage)| |sudo chmod u+x SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_Linux_x86_64.AppImage|" >> ${{github.workspace}}/Release.md
169+
echo "|Ubuntu 24.04|[DEB](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_ubuntu-24.04_amd64.deb)| |[DEB](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_ubuntu-24.04_arm64.deb)| |sudo apt install \"deb file\" |" >> ${{github.workspace}}/Release.md
170+
echo "|Ubuntu 22.04|[DEB](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_ubuntu-22.04_amd64.deb)| |[DEB](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_ubuntu-22.04_arm64.deb)| |sudo apt install \"deb file\" |" >> ${{github.workspace}}/Release.md
171+
echo "|Fedora 42|[RPM](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant-${{env.SerialPortAssistant_VERSION}}-1.fc42.x86_64.rpm)| |[RPM](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant-${{env.SerialPortAssistant_VERSION}}-1.fc42.aarch64.rpm)| |sudo dnf install \"rpm file\" |" >> ${{github.workspace}}/Release.md
172+
173+
- name: Add download in test
174+
if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
175+
run: |
176+
export BRANCH_NAME=${{ github.ref_name }}
177+
if [ "${{ github.ref_name }}" == "master" ]; then
178+
export BRANCH_NAME=test_${{ github.ref_name }}
179+
fi
180+
echo "|Flatpak|[flatpak](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_Linux_x86_64.flatpak)| |[flatpak](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_Linux_aarch64.flatpak)||flatpak install \"flatpak File\" [--user] |" >> ${{github.workspace}}/Release.md
181+
156182
- name: Add flathub download
157183
run: |
158184
echo "" >> ${{github.workspace}}/Release.md
@@ -167,11 +193,11 @@ jobs:
167193
- name: Upload To Github Release
168194
if: ${{ startsWith(github.ref, 'refs/tags/') }}
169195
run: |
170-
gh release upload ${{ github.ref_name }} ${{github.workspace}}/${{env.artifact_path}}/* ${{github.workspace}}/Release.md ${{ github.workspace }}/update.json
196+
gh release upload ${{ github.ref_name }} ${{github.workspace}}/${{env.artifact_path}}/* ${{github.workspace}}/Release.md ${{github.workspace}}/CheckSum.md ${{ github.workspace }}/update.json
171197
172198
- name: Upload test tag To Github Release
173199
if: ${{ startsWith(github.ref, 'refs/heads/master') }}
174200
run: |
175201
gh release create test_${{ github.ref_name }} --prerelease --latest=false --title "Recently developed build - ${{ github.ref_name }}" --notes-file ${{github.workspace}}/Release.md
176-
gh release upload test_${{ github.ref_name }} --clobber ${{github.workspace}}/${{ env.artifact_path }}/* ${{github.workspace}}/Release.md ${{github.workspace}}/update.json --clobber
202+
gh release upload test_${{ github.ref_name }} --clobber ${{github.workspace}}/${{ env.artifact_path }}/* ${{github.workspace}}/Release.md ${{github.workspace}}/CheckSum.md ${{github.workspace}}/update.json --clobber
177203

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ${{matrix.variant.os}}
3737

3838
env:
39-
SerialPortAssistant_VERSION: 0.0.32
39+
SerialPortAssistant_VERSION: 0.5.31
4040
artifact_name: build_docker
4141

4242
# Map the job outputs to step outputs

‎.github/workflows/flatpak.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
env:
2222
artifact_name: SerialPortAssistant
23-
SerialPortAssistant_VERSION: v0.0.32
23+
SerialPortAssistant_VERSION: v0.5.31
2424

2525
# See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
2626
# See: [Choosing the runner for a job](https://docs.github.com/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job)

‎.github/workflows/macos.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
qt_modules: "qtscxml qtmultimedia qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel"
4444
artifact_name: build_macos
4545
VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
46-
SerialPortAssistant_VERSION: 0.5.31
46+
SerialPortAssistant_VERSION: v0.5.31
4747

4848
# Map the job outputs to step outputs
4949
outputs:
@@ -69,7 +69,7 @@ jobs:
6969
with:
7070
path: |
7171
${{env.INSTALL_DIR}}
72-
key: Cache-installed-macos_qt${{matrix.qt_version}}_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}}
72+
key: Cache-installed-macos_qt${{matrix.qt_version}}_${{matrix.qt_arch}}_${{matrix.VCPKG_TARGET_TRIPLET}}_Release
7373

7474
- name: run vcpkg
7575
uses: lukka/run-vcpkg@v11
@@ -108,33 +108,34 @@ jobs:
108108
-DVCPKG_VERBOSE=ON \
109109
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
110110
-DVCPKG_APPLOCAL_DEPS=ON \
111+
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
111112
-DINSTALL_QT=ON \
112113
-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake
113114
cmake --build . --config Release --target install
114115
echo "executable bin/macdeployqt `pwd`/SerialPortAssistant.App -dmg -verbose=3"
115116
macdeployqt SerialPortAssistant.App -dmg -verbose=3
116-
7z a SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos_qt${{matrix.qt_version}}.zip SerialPortAssistant.App
117+
7z a SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.zip SerialPortAssistant.App
117118
if [ -f SerialPortAssistant.dmg ]; then
118119
cp SerialPortAssistant.dmg SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.dmg
119120
fi
120121
121122
- name: Update configure file
122123
working-directory: ${{github.workspace}}/build
123124
run: |
124-
echo "md5 SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos_qt${{matrix.qt_version}}.zip"
125-
md5 SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos_qt${{matrix.qt_version}}.zip
126-
MD5SUM=`md5 SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos_qt${{matrix.qt_version}}.zip|awk '{print $4}'`
127-
echo "SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos_qt${{matrix.qt_version}}.zip md5sum: ${MD5SUM}"
128-
SerialPortAssistant.App/Contents/MacOS/SerialPortAssistantApp \
129-
--file-name SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos_qt${{matrix.qt_version}}.zip \
130-
-u "https://github.com/KangLin/SerialPortAssistant/releases/download/v${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos_qt${{matrix.qt_version}}.zip,https://sourceforge.net/projects/rabbitSerialPortAssistant/v${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos_qt${{matrix.qt_version}}.zip?viasf=1"
131-
--md5 "${MD5SUM}"
125+
echo "md5 SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.zip"
126+
md5 SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.zip
127+
MD5SUM=`md5 SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.zip|awk '{print $4}'`
128+
echo "SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.zip md5sum: ${MD5SUM}"
129+
SerialPortAssistant.App/Contents/MacOS/SerialPortAssistant \
130+
--file-name SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.zip \
131+
--md5 "${MD5SUM}" \
132+
-u "https://github.com/KangLin/SerialPortAssistant/releases/download/v${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.zip,https://sourceforge.net/projects/rabbitSerialPortAssistant/v${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.zip?viasf=1"
132133
133134
- name: Update artifact
134135
uses: actions/upload-artifact@v4
135136
with:
136137
name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.os}}
137138
path: |
138-
${{github.workspace}}/build/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos_qt${{matrix.qt_version}}.zip
139+
${{github.workspace}}/build/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.zip
139140
${{github.workspace}}/build/update_macos_${{matrix.qt_version}}.json
140141
${{github.workspace}}/build/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.os}}.dmg

0 commit comments

Comments
 (0)