Skip to content

Commit 1eb0f21

Browse files
KangLinKangLin
committed
CI: update qt6.9.3 to qt6.10.2
1 parent 859e4e6 commit 1eb0f21

File tree

5 files changed

+18
-21
lines changed

5 files changed

+18
-21
lines changed

‎.github/workflows/android.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
- qt_arch: android_arm64_v8a
1919
VCPKG_TARGET_TRIPLET: arm64-android
2020
ANDROID_ABI: arm64-v8a
21-
qt_version: 6.9.3
21+
qt_version: 6.10.2
2222
BUILD_TYPE: Release
2323

2424
- qt_arch: android_x86_64
2525
VCPKG_TARGET_TRIPLET: x64-android
2626
ANDROID_ABI: x86_64
27-
qt_version: 6.9.3
27+
qt_version: 6.10.2
2828
BUILD_TYPE: Release
2929

3030
# See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
@@ -97,7 +97,7 @@ jobs:
9797
9898
- name: Install Qt of linux_gcc_64
9999
uses: jurplel/install-qt-action@v4
100-
if: ${{ matrix.qt_version == '6.9.3' }}
100+
if: ${{ matrix.qt_version == '6.10.2' }}
101101
with:
102102
dir: '${{env.TOOLS_DIR}}/qt' # optional
103103
version: '${{matrix.qt_version}}'

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ jobs:
214214
echo "" >> ${{github.workspace}}/Release.md
215215
echo "| | x86-64 (64-bit) | x86-32 (32-bit) | AArch64 (ARM64) | ARMv7 (32-bit) |:us: Comment|:cn: 备注|" >> ${{github.workspace}}/Release.md
216216
echo "|:- | :-------------- | :-------------- | :-------------- | :------------- |:------|---|" >> ${{github.workspace}}/Release.md
217-
echo "|Windows|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.3_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_arm64_qt6.9.3_Setup.exe)| |Supported platforms: [x86-32(Qt5)](https://doc.qt.io/qt-5/supported-platforms.html) [x86-64(Qt6)](https://doc.qt.io/qt-6/supported-platforms.html)|支持平台：[x86-32(Qt5)](https://doc.qt.io/qt-5/supported-platforms.html) [x86-64(Qt6)](https://doc.qt.io/qt-6/supported-platforms.html)|" >> ${{github.workspace}}/Release.md
218-
echo "|Android|[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_x86_64_qt6.9.3_Release.apk) | |[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_arm64_v8a_qt6.9.3_Release.apk)| |Experiment|实验性的|" >> ${{github.workspace}}/Release.md
217+
echo "|Windows|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.10.2_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_arm64_qt6.10.2_Setup.exe)| |Supported platforms: [x86-32(Qt5)](https://doc.qt.io/qt-5/supported-platforms.html) [x86-64(Qt6)](https://doc.qt.io/qt-6/supported-platforms.html)|支持平台：[x86-32(Qt5)](https://doc.qt.io/qt-5/supported-platforms.html) [x86-64(Qt6)](https://doc.qt.io/qt-6/supported-platforms.html)|" >> ${{github.workspace}}/Release.md
218+
echo "|Android|[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_x86_64_qt6.10.2_Release.apk) | |[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_arm64_v8a_qt6.10.2_Release.apk)| |Experiment|实验性的|" >> ${{github.workspace}}/Release.md
219219
echo "|Macos|[App zip](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-15-intel.zip) [dmg](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-15-intel.dmg)||[App zip](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-14.zip) [dmg](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos-14.dmg)||Experiment|实验性的|" >> ${{github.workspace}}/Release.md
220220
221221
echo "|Linux|[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64_Setup.zip)| |[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64_Setup.zip)| |Unzip the zip file, then execute \`install.sh\` to install shortcuts for application, links, and directories in graphical user interfaces (GUIs), or execute \`./RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.AppImage\` to run program in the terminal.|解压 zip 文件，然后执行 \`install.sh\` 安装用于图形界面的目录、桌面快捷方式。或者在终端中执行 \`RabbitRemoteControl*.AppImage\` 文件。|" >> ${{github.workspace}}/Release.md

‎.github/workflows/macos.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@ jobs:
1919
include:
2020
- VCPKG_TARGET_TRIPLET: x64-osx
2121
os: macos-15-intel
22-
qt_version: 6.9.3
22+
qt_version: 6.10.2
2323
qt_arch: clang_64
2424
WITH_MACOSX_BUNDLE: false
2525

2626
- VCPKG_TARGET_TRIPLET: arm64-osx
2727
os: macos-15
28-
qt_version: 6.9.3
28+
qt_version: 6.10.2
2929
qt_arch: clang_64
3030
WITH_MACOSX_BUNDLE: false
3131

3232
- VCPKG_TARGET_TRIPLET: arm64-osx
3333
os: macos-14
34-
qt_version: 6.9.3
34+
qt_version: 6.10.2
3535
qt_arch: clang_64
3636
WITH_MACOSX_BUNDLE: true
3737

3838
- VCPKG_TARGET_TRIPLET: arm64-osx
3939
os: macos-14
40-
qt_version: 6.9.3
40+
qt_version: 6.10.2
4141
qt_arch: clang_64
4242
WITH_MACOSX_BUNDLE: false
4343

‎.github/workflows/msvc.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
VCPKG_TARGET_TRIPLET: x64-windows
2020
VCPKG_PLATFORM_TOOLSET: v143
2121
BUILD_TYPE: Release
22-
qt_version: 6.9.3
22+
qt_version: 6.10.2
2323
qt_arch: win64_msvc2022_64
2424
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine
2525
os: windows-2022
@@ -28,7 +28,7 @@ jobs:
2828
VCPKG_TARGET_TRIPLET: arm64-windows
2929
VCPKG_PLATFORM_TOOLSET: v143
3030
BUILD_TYPE: Release
31-
qt_version: 6.9.3
31+
qt_version: 6.10.2
3232
qt_arch: win64_msvc2022_arm64
3333
qt_modules: qt5compat qtimageformats qtmultimedia qtpositioning qtscxml qtserialport qtwebchannel qtwebsockets
3434
os: windows-11-arm
@@ -401,7 +401,7 @@ jobs:
401401
run: git clone https://github.com/KangLin/RabbitCommon.git
402402

403403
- name: Build RabbitRemoteControl with cmake preset
404-
if: false #${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.3' && startsWith(github.ref, 'refs/heads/master')}}
404+
if: false #${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.10.2' && startsWith(github.ref, 'refs/heads/master')}}
405405
working-directory: ${{github.workspace}}
406406
env:
407407
RabbitCommon_ROOT: ${{env.SOURCE_DIR}}/RabbitCommon
@@ -502,7 +502,7 @@ jobs:
502502
#${{env.BUILD_DIR}}\RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Portable.zip
503503
504504
- name: Update artifact update_windows.xml
505-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.3' }}
505+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.10.2' }}
506506
uses: actions/upload-artifact@v4
507507
with:
508508
name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}_xml

‎Package/Flatpak/io.github.KangLin.RabbitRemoteControl.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ id: "io.github.KangLin.RabbitRemoteControl"
33
# See: [available runtimes](https://docs.flatpak.org/en/latest/available-runtimes.html)
44
# See: [flatpak kde runtime](https://invent.kde.org/packaging/flatpak-kde-runtime)
55
runtime: "org.kde.Platform"
6-
runtime-version: "6.9"
6+
runtime-version: "6.10"
77
sdk: "org.kde.Sdk"
88
command: RabbitRemoteControlApp
99

1010
base: io.qt.qtwebengine.BaseApp
11-
base-version: '6.9'
11+
base-version: '6.10'
1212
cleanup-commands:
1313
- /app/cleanup-BaseApp.sh
1414

@@ -48,14 +48,11 @@ finish-args:
4848
- --env=QTWEBENGINEPROCESS_PATH=/app/bin/QtWebEngineProcess
4949

5050
modules:
51-
- shared-modules/libusb/libusb.json
52-
- shared-modules/libsecret/libsecret.json
53-
5451
# Unity 2021 and older require OpenSSL 1.0 or 1.1. Bundle a copy of OpenSSL 1.1.
5552
# https://github.com/flathub/com.unity.UnityHub/pull/73#issuecomment-1407370899
5653
# https://forum.unity.com/threads/workaround-for-libssl-issue-on-ubuntu-22-04.1271405/#post-8098841
5754
- name: openssl-1.1
58-
disabled: false
55+
disabled: true
5956
buildsystem: simple
6057
build-commands:
6158
- ./config --prefix=/app
@@ -153,7 +150,7 @@ modules:
153150
- -Dutils=false
154151

155152
- name: curl
156-
disabled: false
153+
disabled: true
157154
sources:
158155
- type: archive
159156
url: https://github.com/curl/curl/releases/download/curl-8_16_0/curl-8.16.0.tar.xz
@@ -167,7 +164,7 @@ modules:
167164
sources:
168165
- type: git
169166
url: https://github.com/FreeRDP/FreeRDP.git
170-
tag: 3.18.0
167+
tag: 3.22.0
171168
buildsystem: cmake-ninja
172169
builddir: true
173170
config-opts:

0 commit comments

Comments
 (0)