Skip to content

Commit

Permalink
Try GitHub's current MinGW release
Browse files Browse the repository at this point in the history
  • Loading branch information
pcolby committed Jun 16, 2024
1 parent 57124b0 commit 5ef9096
Showing 1 changed file with 15 additions and 13 deletions.
28 changes: 15 additions & 13 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ permissions:

jobs:
linux:
if: false
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand Down Expand Up @@ -148,6 +149,7 @@ jobs:
if-no-files-found: error

mac:
if: false
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down Expand Up @@ -283,16 +285,16 @@ jobs:
fail-fast: false
matrix:
qt:
- 5.9.9
- 5.10.1
- 5.11.3
- 5.12.12
- 5.13.2
- 5.14.2
- 5.15.2
- 6.2.4
- 6.3.2
- 6.4.3
#- 5.9.9
#- 5.10.1
#- 5.11.3
#- 5.12.12
#- 5.13.2
#- 5.14.2
#- 5.15.2
#- 6.2.4
#- 6.3.2
#- 6.4.3
- 6.5.3
- 6.6.3
- 6.7.1
Expand Down Expand Up @@ -377,7 +379,7 @@ jobs:
arch: ${{ matrix.qtArch }}
# Use Qt's shipped MinGW for Qt 6.6+ for now, as the runner's MinGW version crashes with Qt 6.6 and 6.7.
# \todo Remove this if/when the runner's MinGW is updated to fix the incompatibility.
tools: ${{ (startsWith(matrix.qt, '6.6') || startsWith(matrix.qt, '6.7')) && startsWith(matrix.generator, 'MinGW') && 'tools_mingw90' || '' }}
#tools: ${{ (startsWith(matrix.qt, '6.6') || startsWith(matrix.qt, '6.7')) && startsWith(matrix.generator, 'MinGW') && 'tools_mingw90' || '' }}
#add-tools-to-path: true ///< \toto Use once released by install-qt-action.
documentation: true
doc-archives: ${{ (startsWith(matrix.qt, '5.10.') || startsWith(matrix.qt, '5.11.')) && 'qt' || (startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }}
Expand Down Expand Up @@ -405,8 +407,8 @@ jobs:
env:
PROJECT_BUILD_ID: ${{ github.run_number }}.win.${{ matrix.arch }}.${{ matrix.tool }}.qt-${{ matrix.qt }}
run: |
:: \todo Remove this when either the runner's MinGW is upgraded, or add-tools-to-path is released by install-qt-action.
if exist "%GITHUB_WORKSPACE%\..\Qt\Tools\mingw1120_64" set "PATH=%GITHUB_WORKSPACE%\..\Qt\Tools\mingw1120_64\bin\;%PATH%"
#:: \todo Remove this when either the runner's MinGW is upgraded, or add-tools-to-path is released by install-qt-action.
#if exist "%GITHUB_WORKSPACE%\..\Qt\Tools\mingw1120_64" set "PATH=%GITHUB_WORKSPACE%\..\Qt\Tools\mingw1120_64\bin\;%PATH%"
cmake -D CMAKE_BUILD_TYPE=Release ^
-D QT_HOST_PATH=%qtHostPath% ^
-D QT_INSTALL_DOCS=%RUNNER_WORKSPACE%\Qt\Docs\Qt-${{ matrix.qt }} ^
Expand Down

0 comments on commit 5ef9096

Please sign in to comment.