Skip to content

Commit 7c18bfa

Browse files
committed
[Build] Fix 'install-qt-action@v4' new variables and options (openssl, xcb)
1 parent 5b5f5a3 commit 7c18bfa

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

.github/workflows/deployment.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ jobs:
9191
qt_host: 'linux'
9292
qt_target: 'desktop'
9393
qt_arch: 'gcc_64'
94-
qt_tools: '' # To build OpenSSLv3: 'tools_opensslv3_src'
94+
qt_tools: ''
95+
qt_modules: ''
9596
Qt6_CUSTOM_INSTALL_PATH: "/home/runner/work/ArrowDL/qt/"
9697
DIRECTIVE_CMAKE_GENERATOR: ''
9798
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:
101102
qt_host: 'windows'
102103
qt_target: 'desktop'
103104
qt_arch: 'win64_mingw'
104-
qt_tools: 'tools_opensslv3_x64'
105+
qt_tools: 'tools_openssl'
106+
qt_modules: ''
105107
Qt6_CUSTOM_INSTALL_PATH: "D:\\a\\ArrowDL\\qt\\"
106108
DIRECTIVE_CMAKE_GENERATOR: '-G "MinGW Makefiles"'
107109
INSTALL_BOOST_PLATFORM_VERSION: '2019' # 2019, 2022
@@ -260,7 +262,7 @@ jobs:
260262
261263
- name: Install Qt
262264
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.
264266
# https://ddalcino.github.io/aqt-list-server/
265267
with:
266268
aqtversion: '==3.1.*'
@@ -270,19 +272,21 @@ jobs:
270272
target: ${{matrix.qt_target}}
271273
arch: ${{matrix.qt_arch}}
272274
tools: ${{matrix.qt_tools}}
275+
modules: ${{matrix.qt_modules}}
273276
cache: true
277+
add-tools-to-path: false # WIP migration v3 to v4
274278

275279
# Rem: this step was commented because it's too expensive:
276280
# - name: List files in Qt (if Debug Logging is enabled)
277281
# if: runner.debug == '1'
278282
# 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
281285
# # "/home/runner/work/ArrowDL/qt/Qt/6.3.1/gcc_64"
282286
# # "D:\a\ArrowDL\qt\Qt\6.3.1\mingw_64"
283287
#
284288
- 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.
286290
id: qt6openssl
287291
shell: python
288292
# 2 versions present in Ubuntu:
@@ -292,14 +296,14 @@ jobs:
292296
#
293297
# * Qt6 version (3.0.12)
294298
# 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"))
296300
# cd "${{openssl_dir}}"
297301
# ./config
298302
# make
299303
# make test
300304
# sudo make install_sw
301305
# 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"))
303307
# openssl_lib_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libcrypto.a"))
304308
# openssl_ssl_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libssl.a"))
305309
#
@@ -311,7 +315,7 @@ jobs:
311315
# ssleay32 -> libssl
312316
313317
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"))
315319
openssl_lib_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libcrypto.lib"))
316320
openssl_ssl_eay = os.path.normpath(os.path.join(openssl_dir, "lib", "libssl.lib"))
317321
@@ -338,7 +342,7 @@ jobs:
338342
if: ${{ steps.cache-libtorrent.outputs.cache-hit != 'true' }}
339343
env:
340344
Boost_ROOT: ${{ steps.install-boost.outputs.Boost_ROOT }}
341-
Qt6_Dir2: ${{env.Qt6_DIR}}
345+
Qt6_Dir2: ${{env.QT_ROOT_DIR}}
342346
DIRECTIVE_CMAKE_GENERATOR: ${{matrix.DIRECTIVE_CMAKE_GENERATOR}}
343347
BUILD_TESTS: "OFF" # OFF because they take 10+ minutes to build and 776.74 sec to run tests on Ubuntu
344348
DEPRECATED_FUNCTIONS: "OFF" # OFF to remove deprecated functions
@@ -387,7 +391,7 @@ jobs:
387391
- name: Configure Project
388392
env:
389393
Boost_ROOT: ${{ steps.install-boost.outputs.Boost_ROOT }}
390-
Qt6_Dir2: ${{env.Qt6_DIR}}
394+
Qt6_Dir2: ${{env.QT_ROOT_DIR}}
391395
OpenSSL_ROOT_DIR: ${{ steps.qt6openssl.outputs.OpenSSL_ROOT_DIR }}
392396
DIRECTIVE_CMAKE_GENERATOR: ${{matrix.DIRECTIVE_CMAKE_GENERATOR}}
393397
working-directory: "${{env.Project_BUILD_DIR}}"

0 commit comments

Comments
 (0)