From 9b141d3e030a27a5496b60cb952f4d43c2de960d Mon Sep 17 00:00:00 2001 From: Paul Colby Date: Sun, 16 Jun 2024 13:39:22 +1000 Subject: [PATCH] Make use of the add-tools-to-path option Now that qt-install-action@v4 is available. Squashed commit of the following: commit 15835727633ecbb46627fd2bb07ad718ee280fd2 Author: Paul Colby Date: Sun Jun 16 13:19:35 2024 +1000 Re-enable Linux and macOS builds commit 4ad4e66bfd78b3b96267088690c7fd6e24468674 Author: Paul Colby Date: Sun Jun 16 12:42:14 2024 +1000 Re-enable the earlier Qt builds commit dac61272045018a9622c9b00e195679d0160c84c Author: Paul Colby 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 5ef90968f89a05dff0f0c1ab8b8652752276c449 Author: Paul Colby Date: Sun Jun 16 12:10:14 2024 +1000 Try GitHub's current MinGW release --- .github/workflows/build.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 116bb944d..eafa9f5f8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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' || '' }} @@ -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 }} ^