Skip to content

Commit b68424e

Browse files
KangLinKangLin
committed
CI: modify jurplel/install-qt-action@v3 to jurplel/install-qt-action@v4
1 parent c53af3f commit b68424e

File tree

4 files changed

+41
-38
lines changed

4 files changed

+41
-38
lines changed

‎.github/workflows/android.yml‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
cache-key-prefix: cached-qt_${{matrix.qt_version}}_${{matrix.qt_arch}}
123123

124124
- name: Install Qt of android
125-
uses: jurplel/install-qt-action@v3
125+
uses: jurplel/install-qt-action@v4
126126
with:
127127
# Directory to install Qt
128128
dir: '${{env.TOOLS_DIR}}/qt' # optional
@@ -141,7 +141,7 @@ jobs:
141141

142142
- name: chmod qt-cmake
143143
run: |
144-
sudo chmod 777 ${Qt6_DIR}/bin/qt-cmake
144+
sudo chmod 777 ${QT_ROOT_DIR}/bin/qt-cmake
145145
146146
- name: build RabbitVNC
147147
if: false
@@ -152,14 +152,14 @@ jobs:
152152
cd ${{env.SOURCE_DIR}}/RabbitVNC
153153
cmake -E make_directory build
154154
cd build
155-
${Qt6_DIR}/bin/qt-cmake .. \
155+
${QT_ROOT_DIR}/bin/qt-cmake .. \
156156
-DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
157157
-DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
158158
-DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake \
159159
-DBUILD_SHARED_LIBS=OFF \
160160
-DCMAKE_VERBOSE_MAKEFILE=ON \
161161
-DANDROID_ABI=${{env.ANDROID_ABI}} \
162-
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
162+
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
163163
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
164164
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
165165
-DVCPKG_VERBOSE=ON \
@@ -224,7 +224,7 @@ jobs:
224224
-DCMAKE_VERBOSE_MAKEFILE=ON \
225225
-DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
226226
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
227-
-DCMAKE_MAKE_PROGRAM=make \
227+
-GNinja \
228228
-DVCPKG_VERBOSE=ON \
229229
-DVCPKG_TRACE_FIND_PACKAGE=ON \
230230
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
@@ -242,22 +242,22 @@ jobs:
242242
if: false
243243
working-directory: ${{env.SOURCE_DIR}}
244244
env:
245-
QT_ROOT: ${{env.Qt6_DIR}}
245+
QT_ROOT: ${{env.QT_ROOT_DIR}}
246246
run: |
247247
if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/qxmpp ]; then
248248
git clone -b v1.10.3 https://invent.kde.org/libraries/qxmpp.git
249249
cd qxmpp
250250
cmake -E make_directory build
251251
cd build
252-
${Qt6_DIR}/bin/qt-cmake .. \
252+
${QT_ROOT_DIR}/bin/qt-cmake .. \
253253
-DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
254254
-DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
255255
-DBUILD_SHARED_LIBS=OFF \
256256
-DCMAKE_VERBOSE_MAKEFILE=ON \
257257
-DCMAKE_AUTOGEN_VERBOSE=ON \
258-
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
259-
-DCMAKE_PREFIX_PATH=${Qt6_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
260-
-DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
258+
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
259+
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
260+
-DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
261261
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
262262
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
263263
-DVCPKG_VERBOSE=ON \
@@ -280,10 +280,10 @@ jobs:
280280
cd lxqt-build-tools
281281
cmake -E make_directory build
282282
cd build
283-
${Qt6_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
283+
${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
284284
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
285-
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
286-
-DCMAKE_PREFIX_PATH=${Qt6_DIR} \
285+
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
286+
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR} \
287287
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
288288
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
289289
-DVCPKG_VERBOSE=ON \
@@ -303,12 +303,12 @@ jobs:
303303
cd qtermwidget
304304
cmake -E make_directory build
305305
cd build
306-
${Qt6_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
306+
${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
307307
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
308308
-Dlxqt2-build-tools_DIR=${{env.INSTALL_DIR}}/share/cmake/lxqt2-build-tools \
309-
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
310-
-DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
311-
-DCMAKE_PREFIX_PATH=${Qt6_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
309+
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
310+
-DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
311+
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
312312
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
313313
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
314314
-DVCPKG_VERBOSE=ON \
@@ -328,11 +328,11 @@ jobs:
328328
cd qtkeychain
329329
cmake -E make_directory build
330330
cd build
331-
${Qt6_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
331+
${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
332332
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
333-
-DCMAKE_PREFIX_PATH=${Qt6_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
334-
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
335-
-DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
333+
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
334+
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
335+
-DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
336336
-DCMAKE_VERBOSE_MAKEFILE=${BUILD_VERBOSE} \
337337
-DBUILD_WITH_QT6:BOOL=ON
338338
cmake --build . --config Release --parallel $(nproc)
@@ -352,16 +352,16 @@ jobs:
352352
QT_ANDROID_KEYSTORE_STORE_PASS: ${{secrets.STOREPASS}}
353353
JAVA_HOME: ${{env.JAVA_HOME_17_X64}}
354354
run: |
355-
sudo chmod 777 ${Qt6_DIR}/bin/qt-cmake
356-
${Qt6_DIR}/bin/qt-cmake .. \
355+
sudo chmod 777 ${QT_ROOT_DIR}/bin/qt-cmake
356+
${QT_ROOT_DIR}/bin/qt-cmake .. \
357+
-GNinja \
357358
-DCMARK_SHARED=OFF \
358359
-DCMARK_TESTS=OFF \
359360
-DCMARK_STATIC=ON \
360361
-DWITH_CMARK=OFF \
361362
-DWITH_CMARK_GFM=ON \
362363
-DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
363364
-DCMAKE_AUTOGEN_VERBOSE=ON \
364-
-DCMAKE_MAKE_PROGRAM=make \
365365
-DANDROID_PLATFORM=${{env.ANDROID_PLATFORM}} \
366366
-DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
367367
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
@@ -371,12 +371,12 @@ jobs:
371371
-DRABBIT_ENABLE_INSTALL_DEPENDENT=ON \
372372
-DRABBIT_ENABLE_INSTALL_QT=ON \
373373
-DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=ON \
374-
-DCMAKE_PREFIX_PATH=${Qt6_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
375-
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
374+
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
375+
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
376376
-DQT_ANDROID_SIGN_APK=ON \
377377
-DQT_ENABLE_VERBOSE_DEPLOYMENT=ON \
378378
-DVCPKG_TRACE_FIND_PACKAGE=ON \
379-
-DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
379+
-DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
380380
-DCMAKE_INSTALL_PREFIX=`pwd`/install \
381381
-DWITH_WebEngineWidgets=ON \
382382
-DBUILD_LibVNCServer=OFF \
@@ -396,16 +396,17 @@ jobs:
396396
- name: Build RabbitRemoteControl with cmake preset
397397
working-directory: ${{github.workspace}}
398398
env:
399+
# See: https://doc.qt.io/qt-6/cmake-variable-qt-android-sign-apk.html
399400
RabbitCommon_ROOT: ${{env.SOURCE_DIR}}/RabbitCommon
400401
QT_ANDROID_KEYSTORE_PATH: ${{env.SOURCE_DIR}}/RabbitCommon/RabbitCommon.keystore
401402
QT_ANDROID_KEYSTORE_ALIAS: rabbitcommon
402403
QT_ANDROID_KEYSTORE_STORE_PASS: ${{secrets.STOREPASS}}
403404
run: |
404-
export QT_ROOT=${{env.Qt6_DIR}}
405+
export QT_ROOT=${{env.QT_ROOT_DIR}}
405406
cmake --preset "android-${{env.ANDROID_ABI}}-qt6" \
406-
-DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
407+
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
407408
-DQT_ANDROID_SIGN_APK=ON \
408-
-DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
409+
-DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
409410
-DBUILD_LibVNCServer=OFF \
410411
-DLibVNCServer_DIR="${{env.INSTALL_DIR}}/lib/cmake/LibVNCServer" \
411412
-Dtigervnc_DIR=${{env.INSTALL_DIR}}/lib/cmake/tigervnc

‎.github/workflows/docker.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ jobs:
3030
image: ubuntu
3131
lable: ":25.04"
3232
os: ubuntu-24.04
33+
BUILD_VERBOSE: ON
3334
- PACKAGE: appimage
3435
image: ubuntu
3536
lable: ":25.04"
3637
os: ubuntu-24.04-arm
38+
BUILD_VERBOSE: ON
3739

3840
- PACKAGE: rpm
3941
image: fedora
@@ -43,7 +45,7 @@ jobs:
4345
image: fedora
4446
lable: ":41"
4547
os: ubuntu-24.04-arm
46-
48+
4749
# See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
4850
# 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)
4951
# See: https://github.com/actions/runner-images/
@@ -54,9 +56,9 @@ jobs:
5456
artifact_name: build_docker
5557
BUILD_DIR: ${{github.workspace}}/build
5658
SOURCE_DIR: ${{github.workspace}}/.cache/source
57-
TOOLS_DIR: ${{github.workspace}}/.cache/tools
58-
INSTALL_DIR: ${{github.workspace}}/.cache/install_docker
59-
BUILD_VERBOSE: ON
59+
TOOLS_DIR: ${{github.workspace}}/.cache/tools_${{matrix.variant.os}}
60+
INSTALL_DIR: ${{github.workspace}}/.cache/install_docker_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}_${{matrix.variant.lable}}_${{matrix.variant.os}}
61+
BUILD_VERBOSE: ${{matrix.variant.BUILD_VERBOSE}}
6062

6163
# Map the job outputs to step outputs
6264
outputs:
@@ -84,7 +86,7 @@ jobs:
8486
${{env.INSTALL_DIR}}
8587
${{env.TOOLS_DIR}}/linuxdeploy-*
8688
${{env.TOOLS_DIR}}/qt_*
87-
key: install_docker_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}${{matrix.variant.lable}}_${{matrix.os}}
89+
key: install_docker_${{matrix.variant.PACKAGE}}_${{matrix.variant.image}}${{matrix.variant.lable}}_${{matrix.variant.os}}
8890

8991
- name: run docker
9092
run: |
@@ -115,7 +117,7 @@ jobs:
115117
echo "Generate update configure file ......"
116118
pushd RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}_Setup
117119
./RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}.AppImage \
118-
-f "${{github.workspace}}/update_appimage_${{matrix.os}}.json" \
120+
-f "${{github.workspace}}/update_appimage_${{matrix.variant.os}}.json" \
119121
--foc 1 \
120122
--file-name ../RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}_Setup.zip \
121123
-u "https://github.com/KangLin/RabbitRemoteControl/releases/download/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}_Setup.zip;https://master.dl.sourceforge.net/project/rabbitremotecontrol/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_${ARCH}_Setup.zip?viasf=1" \

‎.github/workflows/linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
SOURCE_DIR: ${{github.workspace}}/.cache/source
3838
TOOLS_DIR: ${{github.workspace}}/.cache/tools
3939
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.os}}_${{matrix.BUILD_TYPE}}_${{matrix.PACKAGE}}
40-
BUILD_VERBOSE: ON
40+
BUILD_VERBOSE: OFF
4141
RabbitRemoteControl_VERSION: 0.0.36
4242
artifact_name: build_linux
4343

‎.github/workflows/macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
fi
164164
165165
- name: Install Qt
166-
uses: jurplel/install-qt-action@v3
166+
uses: jurplel/install-qt-action@v4
167167
with:
168168
dir: '${{env.TOOLS_DIR}}/qt' # optional
169169
version: '${{matrix.qt_version}}' # optional, default is 5.15.2

0 commit comments

Comments
 (0)