Use qt6 in CI

COVESA · Jan 9, 2024 · 9d37816 · 9d37816
1 parent 54b7770
commit 9d37816
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml
@@ -79,14 +79,14 @@ jobs:
       - name: Install qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 5.12.12
+          version: 6.5.3
       - name: Build with CMake ${{ matrix.task }}
         run: >
           $env:WORKSPACE=$env:GITHUB_WORKSPACE;
-          $env:QTDIR=$env:Qt5_DIR.Replace('/','\');
+          $env:QTDIR=$env:Qt6_DIR.Replace('/','\');
           $env:CPACK_7Z="true";
           $env:CPACK_NSIS="true";
-          ./build_sdk_windows_qt5_MSVC_cmake.bat
+          ./build_sdk_windows_MSVC_cmake.bat
       - name: Archive artifact
         uses: actions/upload-artifact@v4
         if: ${{ success() }}

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -23,8 +23,8 @@ jobs:
         run: ls -n /Applications/ | grep Xcode*
       - name: Set XCode Version
         run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
-      - name: install qt 5
-        run: brew install qt@5
+      - name: install qt 6
+        run: brew install qt@6
       - name: install build environment
         run: scripts/darwin/install.sh
       - name: Build project
@@ -79,11 +79,11 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           mirror: http://ftp.fau.de/qtproject/
-          version: 5.12.12
+          version: 6.5.3
       - name: Build ${{ matrix.task }}
         run: >
-          $env:WORKSPACE=$env:GITHUB_WORKSPACE; $env:QTDIR=$env:Qt5_DIR.Replace('/','\');
-          ./build_${{ matrix.task }}_windows_qt5_MSVC.bat
+          $env:WORKSPACE=$env:GITHUB_WORKSPACE; $env:QTDIR=$env:Qt6_DIR.Replace('/','\');
+          ./build_${{ matrix.task }}_windows_cmake.bat
       - name: Archive artifact
         run: >
           Compress-Archive -Path .\build\dist -DestinationPath