Skip to content

Commit 4ba9362

Browse files
iakovmrbean-bremen
authored andcommitted
Update install-qt-action to v4
1 parent 8694332 commit 4ba9362

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

.github/workflows/build_latest.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
arch: amd64
2929

3030
- name: Install Qt ${{matrix.qt-version}}
31-
uses: jurplel/install-qt-action@v3
31+
uses: jurplel/install-qt-action@v4
3232
with:
3333
version: ${{ matrix.qt-version }}
3434
modules: ${{startsWith(matrix.qt-version, '6') && 'qt5compat qtscxml qtpositioning qtwebchannel qtmultimedia qtwebengine' || '' }}
@@ -50,12 +50,9 @@ jobs:
5050
echo "QT_VERSION_MAJOR=$QT_VERSION_MAJOR" >> $GITHUB_ENV
5151
QT_VERSION_SHORT=$(cut -f 1,2 -d . <<< "${{matrix.qt-version}}")
5252
echo "QT_VERSION_SHORT=$QT_VERSION_SHORT" >> $GITHUB_OUTPUT
53-
QTDIR=$(eval echo "\$Qt${QT_VERSION_MAJOR}_DIR")
5453
PYTHON_VERSION_FULL=$(python --version 2>&1 | cut -f 2 -d ' ')
5554
PYTHON_VERSION_SHORT=$(cut -f 1,2 -d . <<< $PYTHON_VERSION_FULL)
5655
echo "PYTHON_VERSION_SHORT=$PYTHON_VERSION_SHORT" >> $GITHUB_OUTPUT
57-
echo "QTDIR=$QTDIR" >> $GITHUB_ENV
58-
echo "$QTDIR/bin" >> $GITHUB_PATH
5956
echo "$pythonLocation/bin" >> $GITHUB_PATH
6057
6158
- name: Build generator Ubuntu
@@ -79,7 +76,7 @@ jobs:
7976
shell: bash
8077
run: |
8178
cd generator
82-
if [[ ${{ matrix.os }} == 'windows' && ${{ matrix.qt-version }} =~ '5.1' ]]; then export QTDIR=$Qt5_Dir; fi
79+
QTDIR="$QT_ROOT_DIR" \
8380
UBSAN_OPTIONS="halt_on_error=1" \
8481
ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
8582
./pythonqt_generator

0 commit comments

Comments
 (0)