From ef8b05d4adc5a01007f76160476beec57fd7e7e2 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Tue, 9 Jan 2024 13:21:49 +0100 Subject: [PATCH] Use qt6 in CI --- .github/workflows/BuildPR.yml | 6 +++--- .github/workflows/Release.yml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index 6ac33794..d117f78c 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -83,14 +83,14 @@ jobs: - name: Install qt uses: jurplel/install-qt-action@v3 with: - version: 5.12.12 + version: 6.6.1 - 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 index bbaec2a4..36200c85 100644 --- 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.6.1 - 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