Skip to content

Commit bf2825d

Browse files
KangLinKangLin
committed
Modify snap
1 parent 1b0df20 commit bf2825d

19 files changed

Lines changed: 112 additions & 86 deletions

‎.github/workflows/android.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Author：Kang Lin <kl222@126.com>
2+
13
name: android
24

35
on:
@@ -13,7 +15,7 @@ jobs:
1315
matrix:
1416
BUILD_TYPE: [Release]
1517
qt_arch: [android_arm64_v8a, android_x86_64]
16-
qt_version: [6.6.3]
18+
qt_version: [6.8.1]
1719
include:
1820
- qt_arch: android_arm64_v8a
1921
VCPKG_TARGET_TRIPLET: arm64-android
@@ -25,7 +27,7 @@ jobs:
2527

2628
# See: https://docs.github.com/zh/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
2729
# See: https://github.com/actions/runner-images/
28-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-24.04
2931

3032
env:
3133
artifact_name: build_android
@@ -37,9 +39,9 @@ jobs:
3739
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
3840
VCPKG_DEFAULT_HOST_TRIPLET: x64-linux
3941
ANDROID_ABI: ${{matrix.ANDROID_ABI}}
40-
ANDROID_PLATFORM: android-23
41-
ANDROID_NATIVE_API_LEVEL: 23
42-
qt_modules: 'qtscxml qtserialport qtwebchannel qtpositioning qtwebview'
42+
ANDROID_PLATFORM: android-35
43+
ANDROID_NATIVE_API_LEVEL: 35
44+
qt_modules: 'qtscxml qtserialport'
4345

4446
# Map the job outputs to step outputs
4547
outputs:
@@ -72,9 +74,9 @@ jobs:
7274
with:
7375
dir: '${{env.TOOSL_DIR}}' # optional
7476
version: '${{matrix.qt_version}}'
75-
#host: 'linux'
77+
host: 'linux'
7678
target: 'desktop'
77-
arch: 'gcc_64'
79+
arch: 'linux_gcc_64'
7880
set-env: false
7981
cache: true
8082
cache-key-prefix: cached_qt

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Author：Kang Lin <kl222@126.com>
2+
13
name: build
24

35
env:
@@ -17,6 +19,7 @@ jobs:
1719
uses: ./.github/workflows/msvc.yml
1820

1921
mingw:
22+
if: false
2023
uses: ./.github/workflows/mingw.yml
2124

2225
macos:

‎.github/workflows/codespell.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Author：Kang Lin <kl222@126.com>
2+
13
name: Codespell
24

35
on:

‎.github/workflows/macos.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Author：Kang Lin <kl222@126.com>
12

23
name: build_macos
34

@@ -17,13 +18,13 @@ jobs:
1718
matrix:
1819
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1920
BUILD_TYPE: [Release, Debug]
20-
qt_version: [6.6.3, 5.15.2, 5.12.12]
21+
qt_version: [6.8.1, 5.15.2, 5.12.12]
2122
qt_arch: [clang_64]
2223
config_arch: [x86_64]
2324
VCPKG_TARGET_TRIPLET: [x64-osx]
2425
include:
25-
- qt_version: 6.6.3
26-
qt_modules: qtscxml qtwebchannel qtpositioning qtserialport
26+
- qt_version: 6.8.1
27+
qt_modules: qtscxml qtserialport
2728

2829
- qt_version: 5.15.2
2930

@@ -38,7 +39,7 @@ jobs:
3839
SOURCE_DIR: ${{github.workspace}}/.cache/source
3940
TOOSL_DIR: ${{github.workspace}}/.cache/tools
4041
INSTALL_DIR: ${{github.workspace}}/.cache/install_macos
41-
qt_modules: qtwebengine ${{matrix.qt_modules}}
42+
qt_modules: ${{matrix.qt_modules}}
4243
SerialPortAssistant_VERSION: 0.5.26
4344
artifact_name: build_macos
4445
VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
@@ -116,7 +117,7 @@ jobs:
116117
./install/bin/SerialPortAssistant
117118
118119
- name: Update configure file
119-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.3' }}
120+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.1' }}
120121
working-directory: ${{github.workspace}}/build
121122
run: |
122123
${{env.SOURCE_DIR}}/RabbitCommon/Install/GenerateJsonFile.sh \
@@ -126,7 +127,7 @@ jobs:
126127
"https://github.com/KangLin/SerialPortAssistant/releases/download/v${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_qt${{matrix.qt_version}}_macos.zip,https://sourceforge.net/projects/rabbitSerialPortAssistant/files/v${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_qt${{matrix.qt_version}}_macos.zip"
127128
128129
- name: Update artifact
129-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.3' }}
130+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.1' }}
130131
uses: actions/upload-artifact@v4
131132
with:
132133
name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}

‎.github/workflows/mingw.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Author：Kang Lin <kl222@126.com>
2+
13
name: build_mingw
24

35
on:
@@ -52,12 +54,13 @@ jobs:
5254
env:
5355
PATH: C:\msys64\usr\bin
5456
run: |
57+
C:\msys64\usr\bin\pacman.exe -Syu --noconfirm
5558
C:\msys64\usr\bin\pacman.exe -S --noconfirm ^
5659
mingw-w64-x86_64-cmake ^
5760
mingw-w64-x86_64-make ^
5861
mingw-w64-x86_64-nsis ^
5962
mingw-w64-x86_64-gcc ^
60-
mingw-w64-x86_64-qt5 ^
63+
mingw-w64-x86_64-qt6 ^
6164
mingw-w64-x86_64-cmark ^
6265
mingw-w64-x86_64-zlib ^
6366
mingw-w64-x86_64-openssl ^
@@ -90,17 +93,17 @@ jobs:
9093
-DCMARK_STATIC=ON ^
9194
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} ^
9295
-DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/install ^
93-
-DRABBIT_ENABLE_INSTALL_DEPENDENT=ON ^
94-
-DRABBIT_ENABLE_INSTALL_QT=ON ^
96+
-DRABBIT_ENABLE_INSTALL_DEPENDENT=OFF ^
97+
-DRABBIT_ENABLE_INSTALL_QT=OFF ^
9598
-DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=OFF ^
9699
-DBUILD_FREERDP=ON ^
97100
-DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}
98101
cmake --build . --config ${{ matrix.BUILD_TYPE }}
99-
cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install
100-
copy /Y C:\msys64\mingw64\bin\*.dll install\bin
101-
copy /Y ${{env.INSTALL_DIR}}\bin\*.dll install\bin
102-
copy /Y ${{env.INSTALL_DIR}}\lib\*.dll install\bin
103-
makensis ${{github.workspace}}\build\Install.nsi
102+
;cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install
103+
;copy /Y C:\msys64\mingw64\bin\*.dll install\bin
104+
;copy /Y ${{env.INSTALL_DIR}}\bin\*.dll install\bin
105+
;copy /Y ${{env.INSTALL_DIR}}\lib\*.dll install\bin
106+
;makensis ${{github.workspace}}\build\Install.nsi
104107
105108
- name: update artifact
106109
if: false # ${{ matrix.BUILD_TYPE == 'Release' }}

‎.github/workflows/msvc.yml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Author：Kang Lin <kl222@126.com>
2+
13
name: build_msvc
24

35
on:
@@ -12,14 +14,14 @@ jobs:
1214
strategy:
1315
matrix:
1416
BUILD_TYPE: [Release, Debug]
15-
qt_version: [6.6.3, 5.15.2, 5.12.12]
17+
qt_version: [6.8.1, 5.15.2, 5.12.12]
1618
include:
17-
- qt_version: 6.6.3
19+
- qt_version: 6.8.1
1820
VCPKG_TARGET_TRIPLET: x64-windows
1921
VCPKG_PLATFORM_TOOLSET: v143
20-
qt_arch: win64_msvc2019_64
22+
qt_arch: win64_msvc2022_64
2123
CMAKE_GENERATOR_PLATFORM: x64
22-
qt_modules: qtscxml qtserialport qtwebchannel qtpositioning
24+
qt_modules: qtscxml qtserialport
2325

2426
- qt_version: 5.15.2
2527
VCPKG_TARGET_TRIPLET: x64-windows
@@ -40,17 +42,17 @@ jobs:
4042
runs-on: windows-latest
4143

4244
env:
45+
SerialPortAssistant_VERSION: v0.5.26
4346
SOURCE_DIR: ${{github.workspace}}\.cache\source
4447
TOOSL_DIR: ${{github.workspace}}\.cache\tools
4548
INSTALL_DIR: ${{github.workspace}}\.cache\install_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}}
4649
CMAKE_GENERATOR: "Visual Studio 17 2022"
47-
VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
48-
VCPKG_MANIFEST_DIR: "${{github.workspace}}${{matrix.VCPKG_MANIFEST_DIR}}"
4950
CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
50-
SerialPortAssistant_VERSION: v0.5.26
5151
VCPKGGITCOMMITID: 59aeb8fe8fe1c980de6bd5ba634cf21024522d81
5252
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
53-
qt_modules: qtwebengine ${{matrix.qt_modules}}
53+
VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
54+
VCPKG_MANIFEST_DIR: "${{github.workspace}}${{matrix.VCPKG_MANIFEST_DIR}}"
55+
qt_modules: ${{matrix.qt_modules}}
5456
artifact_name: build_msvc
5557

5658
# Map the job outputs to step outputs
@@ -65,7 +67,7 @@ jobs:
6567
- name: Checkout Repository
6668
uses: actions/checkout@v3
6769
with:
68-
submodules: true
70+
submodules: recursive
6971

7072
- name: Make directories
7173
run: |
@@ -80,7 +82,7 @@ jobs:
8082
with:
8183
path: |
8284
${{env.INSTALL_DIR}}
83-
key: cache-installed-msvc-${{ matrix.qt_arch}}
85+
key: cache-installed-msvc-${{matrix.qt_arch}}
8486

8587
- name: run-vcpkg
8688
uses: lukka/run-vcpkg@v11
@@ -119,8 +121,8 @@ jobs:
119121
-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake ^
120122
-DVCPKG_MANIFEST_DIR=${{env.VCPKG_MANIFEST_DIR}} ^
121123
-DVCPKG_VERBOSE=ON ^
122-
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=OFF ^
123-
-DVCPKG_APPLOCAL_DEPS=OFF ^
124+
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON ^
125+
-DVCPKG_APPLOCAL_DEPS=ON ^
124126
-DRABBIT_ENABLE_INSTALL_DEPENDENT=ON ^
125127
-DRABBIT_ENABLE_INSTALL_QT=ON ^
126128
-DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=OFF
@@ -140,7 +142,7 @@ jobs:
140142
copy /Y SerialPortAssistant_Setup_${{env.SerialPortAssistant_VERSION}}.exe SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe
141143
142144
- name: Update configure file
143-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.3' }}
145+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.1' }}
144146
working-directory: ${{github.workspace}}\build
145147
run: |
146148
.\install\bin\SerialPortAssistant.exe ^

‎.github/workflows/ubuntu.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Author：Kang Lin <kl222@126.com>
2+
13
name: build_ubuntu
24

35
on:

‎App/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/App/SerialPortAssistant.ico
7474
COMPONENT Application)
7575

7676
if(UNIX AND NOT ANDROID)
77-
INSTALL(FILES ${CMAKE_SOURCE_DIR}/share/org.Rabbit.SerialPortAssistant.desktop
77+
configure_file(${CMAKE_SOURCE_DIR}/share/org.Rabbit.SerialPortAssistant.desktop.in
78+
${CMAKE_BINARY_DIR}/org.Rabbit.SerialPortAssistant.desktop @ONLY)
79+
INSTALL(FILES ${CMAKE_BINARY_DIR}/org.Rabbit.SerialPortAssistant.desktop
7880
DESTINATION "${CMAKE_INSTALL_DATADIR}/applications"
7981
COMPONENT Application)
8082
INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/share/SerialPortAssistant.sh

‎ChangeLog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
- Version: v0.5.27
22
- Add snap
3+
- Greater than Android 9
34

45
- Version: v0.5.26
56
- Modify SetStatusInfo the default color

‎ChangeLog_zh_CN.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
- 版本: v0.5.27
22
- 增加 snap
3+
- 大于 Android 9
34

45
- 版本: v0.5.26
56
- 修改 SetStatusInfo 默认颜色

0 commit comments

Comments
 (0)