Update install-qt-action to v4

MeVisLab · Jun 2, 2024 · 4ba9362 · 4ba9362
1 parent 8694332
commit 4ba9362
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/.github/workflows/build_latest.yml b/.github/workflows/build_latest.yml
@@ -28,7 +28,7 @@ jobs:
         arch: amd64
 
     - name: Install Qt ${{matrix.qt-version}}
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{ matrix.qt-version }}
         modules: ${{startsWith(matrix.qt-version, '6') && 'qt5compat qtscxml qtpositioning qtwebchannel qtmultimedia qtwebengine' || '' }}
@@ -50,12 +50,9 @@ jobs:
         echo "QT_VERSION_MAJOR=$QT_VERSION_MAJOR" >> $GITHUB_ENV
         QT_VERSION_SHORT=$(cut -f 1,2 -d . <<< "${{matrix.qt-version}}")
         echo "QT_VERSION_SHORT=$QT_VERSION_SHORT" >> $GITHUB_OUTPUT
-        QTDIR=$(eval echo "\$Qt${QT_VERSION_MAJOR}_DIR")
         PYTHON_VERSION_FULL=$(python --version 2>&1 | cut -f 2 -d ' ')
         PYTHON_VERSION_SHORT=$(cut -f 1,2 -d . <<< $PYTHON_VERSION_FULL)
         echo "PYTHON_VERSION_SHORT=$PYTHON_VERSION_SHORT" >> $GITHUB_OUTPUT
-        echo "QTDIR=$QTDIR" >> $GITHUB_ENV
-        echo "$QTDIR/bin" >> $GITHUB_PATH
         echo "$pythonLocation/bin" >> $GITHUB_PATH
 
     - name: Build generator Ubuntu
@@ -79,7 +76,7 @@ jobs:
       shell: bash
       run: |
         cd generator
-        if [[ ${{ matrix.os }} == 'windows' && ${{ matrix.qt-version }} =~ '5.1' ]]; then export QTDIR=$Qt5_Dir; fi 
+        QTDIR="$QT_ROOT_DIR" \
         UBSAN_OPTIONS="halt_on_error=1" \
         ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
         ./pythonqt_generator