|
74 | 74 | run: >
|
75 | 75 | sudo apt install qt6-{base-{dev{,-tools},doc-dev},connectivity-{dev,doc-html},l10n-tools,tools-dev{,-tools}}
|
76 | 76 | - name: Install online Qt version
|
77 |
| - if: contains(matrix.qt, '.') && matrix.arch != 'arm64' # ie if not using Ubuntu's Qt5/Qt6. |
| 77 | + if: contains(matrix.qt, '.') # ie if not using Ubuntu's Qt5/Qt6. |
78 | 78 | uses: jurplel/install-qt-action@v4
|
79 | 79 | with:
|
80 | 80 | version: ${{ matrix.qt }}
|
|
86 | 86 | (startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }}
|
87 | 87 | doc-modules: ${{ startsWith(matrix.qt, '6') && 'qtbluetooth' || '' }}
|
88 | 88 | aqtversion: '>=3.2.0' # 3.2.0+ required for Qt 6.8+ support; https://github.com/miurahr/aqtinstall/issues/843
|
89 |
| - - name: Install online Qt version for arm64 |
90 |
| - # \todo Revert to only using jurplel's action when issue #248 is resolved. |
91 |
| - # \todo See https://github.com/jurplel/install-qt-action/issues/248 |
92 |
| - if: contains(matrix.qt, '.') && matrix.arch == 'arm64' # ie if not using Ubuntu's Qt5/Qt6. |
93 |
| - uses: jdpurcell/install-qt-action@v4 |
94 |
| - with: |
95 |
| - version: ${{ matrix.qt }} |
96 |
| - modules: ${{ startsWith(matrix.qt, '6') && 'qtconnectivity' || '' }} |
97 |
| - setup-python: false |
98 |
| - documentation: true |
99 |
| - doc-archives: >- |
100 |
| - ${{ (startsWith(matrix.qt, '5.10.') || startsWith(matrix.qt, '5.11.')) && 'qt' || |
101 |
| - (startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }} |
102 |
| - doc-modules: ${{ startsWith(matrix.qt, '6') && 'qtbluetooth' || '' }} |
103 |
| - aqtversion: '>=3.2.0' # 3.2.0+ required for Qt 6.8+ support; https://github.com/miurahr/aqtinstall/issues/843 |
104 | 89 | - name: Upload aqtinstall log file
|
105 | 90 | if: failure()
|
106 | 91 | uses: actions/upload-artifact@v4
|
|
0 commit comments