@@ -159,9 +159,8 @@ jobs:
159159 runs-on : macos-${{ matrix.macos-version }}
160160 steps :
161161 - name : Install Qt
162- uses : jurplel/install-qt-action@v3
162+ uses : jurplel/install-qt-action@v4
163163 with :
164- aqtversion : ' ==2.1.*'
165164 version : ${{ matrix.qt-version }}
166165 host : ' mac'
167166 target : ' desktop'
@@ -183,7 +182,7 @@ jobs:
183182 set -eu
184183 PYTHON_VERSION_FULL=$(python --version 2>&1 | cut -f 2 -d ' ')
185184 PYTHON_VERSION_SHORT=$(cut -f 1,2 -d . <<< $PYTHON_VERSION_FULL)
186- QT_VERSION_FULL=$($Qt5_Dir /bin/qmake -query QT_VERSION)
185+ QT_VERSION_FULL=$($QT_ROOT_DIR /bin/qmake -query QT_VERSION)
187186 QT_VERSION_SHORT=$(cut -f 1,2 -d . <<< $QT_VERSION_FULL)
188187 MACOS_VERSION_FULL=$(sw_vers -productVersion)
189188 MACOS_VERSION_SHORT=$(cut -f 1,2 -d . <<< $MACOS_VERSION_FULL)
@@ -221,7 +220,7 @@ jobs:
221220 cd generator
222221 # workaround to allow to find the Qt include dirs for installed standard qt packages
223222 UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
224- QTDIR=-UNDEFINED- ./pythonqt_generator --qt-version=${{ steps.versions.outputs.QT_VERSION_FULL }} --include-paths=$Qt5_Dir /lib
223+ QTDIR=-UNDEFINED- ./pythonqt_generator --qt-version=${{ steps.versions.outputs.QT_VERSION_FULL }} --include-paths=$QT_ROOT_DIR /lib
225224
226225 - name : Upload Wrappers
227226 uses : actions/upload-artifact@v4
@@ -281,9 +280,8 @@ jobs:
281280 arch : amd64${{ contains(matrix.python-arch, 'x86') && '_x86' || '' }}
282281
283282 - name : Install Qt
284- uses : jurplel/install-qt-action@v3
283+ uses : jurplel/install-qt-action@v4
285284 with :
286- aqtversion : ' ==2.1.*'
287285 version : ${{ matrix.qt-version }}
288286 host : ' windows'
289287 target : ' desktop'
@@ -303,22 +301,14 @@ jobs:
303301 id : versions
304302 run : |
305303 set -eu
306- QT_VERSION_FULL=$("$Qt5_Dir /bin/qmake" -query QT_VERSION)
304+ QT_VERSION_FULL=$("$QT_ROOT_DIR /bin/qmake" -query QT_VERSION)
307305 QT_VERSION_SHORT=$(cut -f 1,2 -d . <<< $QT_VERSION_FULL)
308306 PYTHON_VERSION_FULL=$(python --version 2>&1 | cut -f 2 -d ' ')
309307 PYTHON_VERSION_SHORT=$(cut -f 1,2 -d . <<< $PYTHON_VERSION_FULL)
310308 echo "QT_VERSION_FULL=$QT_VERSION_FULL" | tee -a $GITHUB_OUTPUT
311309 echo "QT_VERSION_SHORT=$QT_VERSION_SHORT" | tee -a $GITHUB_OUTPUT
312310 echo "PYTHON_VERSION_SHORT=$PYTHON_VERSION_SHORT" | tee -a $GITHUB_OUTPUT
313311
314- - name : Add Qt and MinGW to PATH
315- shell : cmd
316- run : |
317- set "ADDPATH=%Qt5_Dir%\bin"
318- ${{ contains(matrix.qt-arch, 'mingw') && format('FOR /F "tokens=1,2 delims=_" %%I IN ("{0}") DO SET "ADDPATH=%ADDPATH%;%IQTA_TOOLS%\%%J0_{1}\bin', matrix.qt-arch, contains(matrix.qt-arch, 'win32') && '32' || '64') || '' }}
319- echo PATH=%ADDPATH%;%PATH% >> %GITHUB_ENV%
320- echo CL=/MP >> $GITHUB_ENV
321-
322312 - name : Build PythonQt
323313 shell : cmd
324314 run : |
@@ -333,13 +323,13 @@ jobs:
333323 set PYTHONASYNCIODEBUG=1
334324 set PYTHONWARNINGS=error
335325 mingw32-make -j 2 && mingw32-make check "TESTARGS=-platform offscreen" ^
336- || nmake && nmake check "TESTARGS=-platform offscreen"
326+ || set CL=/MP && nmake && nmake check "TESTARGS=-platform offscreen"
337327
338328 - name : Generate Wrappers
339329 shell : cmd
340330 run : |
341331 cd generator
342- set QTDIR=%Qt5_Dir %
332+ set QTDIR=%QT_ROOT_DIR %
343333 pythonqt_generator
344334
345335 - name : Upload Wrappers
0 commit comments