From a0b065534c003eed0cb67f7503d9bc69af90bf8d Mon Sep 17 00:00:00 2001 From: Paul Colby Date: Wed, 24 Jan 2024 21:55:10 +1100 Subject: [PATCH] Treat Qt 5.10 and 5.11 differently They only have a single `qt` doc archive. --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 876111674..6602af60f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -108,7 +108,7 @@ jobs: version: ${{ matrix.qt }} modules: ${{ startsWith(matrix.qt, '6') && 'qtconnectivity' || '' }} documentation: true - doc-archives: qtcore ${{ startsWith(matrix.qt, '5') && 'qtbluetooth' || '' }} + 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' || '' }} aqtversion: ==3.1.* # \todo https://github.com/jurplel/install-qt-action/issues/218 - name: Install linuxdeploy @@ -209,7 +209,7 @@ jobs: version: ${{ matrix.qt }} modules: ${{ startsWith(matrix.qt, '6') && 'qtconnectivity' || '' }} documentation: true - doc-archives: qtcore ${{ startsWith(matrix.qt, '5') && 'qtbluetooth' || '' }} + 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' || '' }} aqtversion: ==3.1.* # \todo https://github.com/jurplel/install-qt-action/issues/218 - name: Build @@ -351,7 +351,7 @@ jobs: tools: ${{ startsWith(matrix.qt, '6.6') && startsWith(matrix.generator, 'MinGW') && 'tools_mingw90' || '' }} #add-tools-to-path: true ///< \toto Use once released by install-qt-action. documentation: true - doc-archives: qtcore ${{ startsWith(matrix.qt, '5') && 'qtbluetooth' || '' }} + 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' || '' }} aqtversion: ==3.1.* # \todo https://github.com/jurplel/install-qt-action/issues/218 - name: Configure cross-compilation