Skip to content

Commit 545fb11

Browse files
committed
Revert to only using jurplel's action
Now that issue [#248][] is resolved. [#248]: jurplel/install-qt-action#248
1 parent 79fd992 commit 545fb11

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
run: >
7575
sudo apt install qt6-{base-{dev{,-tools},doc-dev},connectivity-{dev,doc-html},l10n-tools,tools-dev{,-tools}}
7676
- 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.
7878
uses: jurplel/install-qt-action@v4
7979
with:
8080
version: ${{ matrix.qt }}
@@ -86,21 +86,6 @@ jobs:
8686
(startsWith(matrix.qt, '5') && 'qtcore qtbluetooth' || 'qtcore') }}
8787
doc-modules: ${{ startsWith(matrix.qt, '6') && 'qtbluetooth' || '' }}
8888
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
10489
- name: Upload aqtinstall log file
10590
if: failure()
10691
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)