Skip to content

Commit

Permalink
Make use of the add-tools-to-path option
Browse files Browse the repository at this point in the history
Now that qt-install-action@v4 is available.

Squashed commit of the following:

commit 1583572
Author: Paul Colby <git@colby.id.au>
Date:   Sun Jun 16 13:19:35 2024 +1000

    Re-enable Linux and macOS builds

commit 4ad4e66
Author: Paul Colby <git@colby.id.au>
Date:   Sun Jun 16 12:42:14 2024 +1000

    Re-enable the earlier Qt builds

commit dac6127
Author: Paul Colby <git@colby.id.au>
Date:   Sun Jun 16 12:26:22 2024 +1000

    Make use of the add-tools-to-path option

    Now available with qt-install-action@v4.

commit 5ef9096
Author: Paul Colby <git@colby.id.au>
Date:   Sun Jun 16 12:10:14 2024 +1000

    Try GitHub's current MinGW release
  • Loading branch information
pcolby committed Jun 16, 2024
1 parent be1eb46 commit 9b141d3
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ jobs:
# 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' || '' }}
#add-tools-to-path: true ///< \toto Use once released by install-qt-action.
add-tools-to-path: true
documentation: true
doc-archives: ${{ (startsWith(matrix.qt, '5.10.') || startsWith(matrix.qt, '5.11.')) && 'qt' || (startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }}
doc-modules: ${{ startsWith(matrix.qt, '6') && 'qtbluetooth' || '' }}
Expand All @@ -405,8 +405,6 @@ 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%"
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 9b141d3

Please sign in to comment.