91
91
qt_host : ' linux'
92
92
qt_target : ' desktop'
93
93
qt_arch : ' gcc_64'
94
- qt_tools : ' ' # To build OpenSSLv3: 'tools_opensslv3_src'
94
+ qt_tools : ' '
95
+ qt_modules : ' '
95
96
Qt6_CUSTOM_INSTALL_PATH : " /home/runner/work/ArrowDL/qt/"
96
97
DIRECTIVE_CMAKE_GENERATOR : ' '
97
98
INSTALL_BOOST_PLATFORM_VERSION : ' 18.04' # 18.04, 20.04 Rem: Ubuntu 20.04 doesn't have Boost 1.77.0
@@ -101,7 +102,8 @@ jobs:
101
102
qt_host : ' windows'
102
103
qt_target : ' desktop'
103
104
qt_arch : ' win64_mingw'
104
- qt_tools : ' tools_opensslv3_x64'
105
+ qt_tools : ' tools_openssl'
106
+ qt_modules : ' '
105
107
Qt6_CUSTOM_INSTALL_PATH : " D:\\ a\\ ArrowDL\\ qt\\ "
106
108
DIRECTIVE_CMAKE_GENERATOR : ' -G "MinGW Makefiles"'
107
109
INSTALL_BOOST_PLATFORM_VERSION : ' 2019' # 2019, 2022
@@ -260,7 +262,7 @@ jobs:
260
262
261
263
- name : Install Qt
262
264
uses : jurplel/install-qt-action@v4
263
- # Rem: Once installed, ${{env.Qt6_DIR }} is set.
265
+ # Rem: Once installed, ${{env.QT_ROOT_DIR }} is set.
264
266
# https://ddalcino.github.io/aqt-list-server/
265
267
with :
266
268
aqtversion : ' ==3.1.*'
@@ -270,19 +272,21 @@ jobs:
270
272
target : ${{matrix.qt_target}}
271
273
arch : ${{matrix.qt_arch}}
272
274
tools : ${{matrix.qt_tools}}
275
+ modules : ${{matrix.qt_modules}}
273
276
cache : true
277
+ add-tools-to-path : false # WIP migration v3 to v4
274
278
275
279
# Rem: this step was commented because it's too expensive:
276
280
# - name: List files in Qt (if Debug Logging is enabled)
277
281
# if: runner.debug == '1'
278
282
# shell: bash
279
- # run: cd "${{env.Qt6_DIR }}/../../" && ls -alR
280
- # # env.Qt6_DIR
283
+ # run: cd "${{env.QT_ROOT_DIR }}/../../" && ls -alR
284
+ # # env.QT_ROOT_DIR
281
285
# # "/home/runner/work/ArrowDL/qt/Qt/6.3.1/gcc_64"
282
286
# # "D:\a\ArrowDL\qt\Qt\6.3.1\mingw_64"
283
287
#
284
288
- name : Find OpenSSL in Qt6
285
- # The thing is that "env.Qt6_DIR " is defined only at runtime, *after* install-qt-action has run.
289
+ # The thing is that "env.QT_ROOT_DIR " is defined only at runtime, *after* install-qt-action has run.
286
290
id : qt6openssl
287
291
shell : python
288
292
# 2 versions present in Ubuntu:
@@ -292,14 +296,14 @@ jobs:
292
296
#
293
297
# * Qt6 version (3.0.12)
294
298
# To build it:
295
- # openssl_dir = os.path.normpath(os.path.join(r"${{env.Qt6_DIR }}", "..", "..", "Tools", "OpenSSLv3", "src"))
299
+ # openssl_dir = os.path.normpath(os.path.join(r"${{env.QT_ROOT_DIR }}", "..", "..", "Tools", "OpenSSLv3", "src"))
296
300
# cd "${{openssl_dir}}"
297
301
# ./config
298
302
# make
299
303
# make test
300
304
# sudo make install_sw
301
305
# Then:
302
- # openssl_dir = os.path.normpath(os.path.join(r"${{env.Qt6_DIR }}", "..", "..", "Tools", "OpenSSLv3", "src"))
306
+ # openssl_dir = os.path.normpath(os.path.join(r"${{env.QT_ROOT_DIR }}", "..", "..", "Tools", "OpenSSLv3", "src"))
303
307
# openssl_lib_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libcrypto.a"))
304
308
# openssl_ssl_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libssl.a"))
305
309
#
@@ -311,7 +315,7 @@ jobs:
311
315
# ssleay32 -> libssl
312
316
313
317
if "${{ matrix.os }}" == "windows-latest":
314
- openssl_dir = os.path.normpath(os.path.join(r"${{env.Qt6_DIR }}", "..", "..", "Tools", "OpenSSLv3", "Win_x64"))
318
+ openssl_dir = os.path.normpath(os.path.join(r"${{env.QT_ROOT_DIR }}", "..", "..", "Tools", "OpenSSLv3", "Win_x64"))
315
319
openssl_lib_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libcrypto.lib"))
316
320
openssl_ssl_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libssl.lib"))
317
321
@@ -338,7 +342,7 @@ jobs:
338
342
if : ${{ steps.cache-libtorrent.outputs.cache-hit != 'true' }}
339
343
env :
340
344
Boost_ROOT : ${{ steps.install-boost.outputs.Boost_ROOT }}
341
- Qt6_Dir2 : ${{env.Qt6_DIR }}
345
+ Qt6_Dir2 : ${{env.QT_ROOT_DIR }}
342
346
DIRECTIVE_CMAKE_GENERATOR : ${{matrix.DIRECTIVE_CMAKE_GENERATOR}}
343
347
BUILD_TESTS : " OFF" # OFF because they take 10+ minutes to build and 776.74 sec to run tests on Ubuntu
344
348
DEPRECATED_FUNCTIONS : " OFF" # OFF to remove deprecated functions
@@ -387,7 +391,7 @@ jobs:
387
391
- name : Configure Project
388
392
env :
389
393
Boost_ROOT : ${{ steps.install-boost.outputs.Boost_ROOT }}
390
- Qt6_Dir2 : ${{env.Qt6_DIR }}
394
+ Qt6_Dir2 : ${{env.QT_ROOT_DIR }}
391
395
OpenSSL_ROOT_DIR : ${{ steps.qt6openssl.outputs.OpenSSL_ROOT_DIR }}
392
396
DIRECTIVE_CMAKE_GENERATOR : ${{matrix.DIRECTIVE_CMAKE_GENERATOR}}
393
397
working-directory : " ${{env.Project_BUILD_DIR}}"
0 commit comments