Skip to content

Commit a615a28

Browse files
authored
disabled installation of Qt dependencies in CI when we only require the headers (#7214)
1 parent 6ee9633 commit a615a28

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/workflows/clang-tidy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ jobs:
3333
sudo apt-get update
3434
sudo apt-get install -y cmake make
3535
sudo apt-get install -y libpcre3-dev
36-
sudo apt-get install -y libffi7 # work around missing dependency for Qt install step
37-
sudo apt-get install -y libcups2-dev # required for Qt6PrintSupport in CMake since Qt 6.7.3
36+
sudo apt-get install -y libgl-dev # fixes missing dependency for Qt in CMake
3837
3938
- name: Install clang
4039
run: |
@@ -49,6 +48,7 @@ jobs:
4948
with:
5049
version: ${{ env.QT_VERSION }}
5150
modules: 'qtcharts'
51+
install-deps: false
5252
cache: true
5353

5454
- name: Verify clang-tidy configuration

.github/workflows/iwyu.yml

-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
apt-get update
4545
apt-get install -y cmake clang make libpcre3-dev
4646
apt-get install -y libgl-dev # fixes missing dependency for Qt in CMake
47-
apt-get install -y libcups2-dev # required for Qt6PrintSupport in CMake since Qt 6.7.3
4847
apt-get install -y iwyu
4948
5049
- name: Install missing software on archlinux
@@ -70,7 +69,6 @@ jobs:
7069
dnf install -y cmake clang pcre-devel
7170
dnf install -y libglvnd-devel # fixes missing dependency for Qt in CMake
7271
dnf install -y p7zip-plugins # required as fallback for py7zr in Qt installation
73-
dnf install -y cups-devel # required for Qt6PrintSupport in CMake since Qt 6.7.3
7472
dnf install -y iwyu
7573
ln -s iwyu_tool.py /usr/bin/iwyu_tool
7674
@@ -167,7 +165,6 @@ jobs:
167165
run: |
168166
sudo apt-get update
169167
sudo apt-get install -y cmake make libpcre3-dev
170-
sudo apt-get install -y libcups2-dev # required for Qt6PrintSupport in CMake since Qt 6.7.3
171168
sudo apt-get install -y libgl-dev # missing dependency for using Qt in CMake
172169
173170
- name: Install clang

.github/workflows/selfcheck.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@ jobs:
3939
sudo apt-get install clang-14
4040
sudo apt-get install libboost-container-dev
4141
sudo apt-get install valgrind
42-
sudo apt-get install -y libcups2-dev # required for Qt6PrintSupport in CMake since Qt 6.7.3
42+
sudo apt-get install -y libgl-dev # fixes missing dependency for Qt in CMake
4343
4444
- name: Install Qt ${{ env.QT_VERSION }}
4545
uses: jurplel/install-qt-action@v4
4646
with:
4747
version: ${{ env.QT_VERSION }}
4848
modules: 'qtcharts'
49+
install-deps: false
4950
cache: true
5051

5152
# TODO: cache this - perform same build as for the other self check

0 commit comments

Comments
 (0)