Skip to content

Commit 6c10d87

Browse files
committed
Fix installing libkf6guiaddons
1 parent f88c663 commit 6c10d87

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

.github/workflows/build-linux.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ env:
4040
libqt6svg6-dev
4141
libqt6svg6
4242
43-
libkf6guiaddons-dev
4443
libkf6guiaddons
44+
libkf6guiaddons-dev
45+
libkf6notifications-dev
46+
libkf6statusnotifieritem-dev
4547
4648
libqt6waylandclient6
4749
qt6-wayland
@@ -65,9 +67,6 @@ env:
6567
qtwayland5-dev-tools
6668
6769
libkf5notifications-dev
68-
kf6_packages: >-
69-
libkf6notifications-dev
70-
libkf6statusnotifieritem-dev
7170
# FIXME: Sending signal to client process does not cause the process
7271
# to exit with non-zero code with GitHub Actions. Why?
7372
COPYQ_TESTS_SKIP_SIGNAL: '1'
@@ -86,7 +85,6 @@ jobs:
8685
compiler: g++
8786
compiler_package: g++
8887
with_qt6: false
89-
with_native_notifications: true
9088
test_x11: true
9189
cmake_preset: Debug
9290

@@ -95,7 +93,6 @@ jobs:
9593
compiler: g++
9694
compiler_package: g++
9795
with_qt6: true
98-
with_native_notifications: false
9996
test_x11: true
10097
test_wayland: true
10198
coverage: true
@@ -111,7 +108,6 @@ jobs:
111108
compiler: clang++
112109
compiler_package: clang
113110
with_qt6: true
114-
with_native_notifications: false
115111
cmake_preset: Debug
116112

117113
- os: ubuntu-latest
@@ -120,7 +116,6 @@ jobs:
120116
compiler_package: g++
121117
appimage: true
122118
with_qt6: true
123-
with_native_notifications: true
124119
cmake_preset: Release
125120

126121
steps:
@@ -140,12 +135,20 @@ jobs:
140135
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
141136
142137
- name: Set up KDE Neon repository for KF6 packages
143-
if: matrix.appimage
138+
if: matrix.with_qt6
144139
run: |
145140
# Download and install KDE neon archive keyring
146-
wget -qO - https://archive.neon.kde.org/public.key | sudo gpg --dearmor -o /usr/share/keyrings/neon-archive-keyring.gpg
141+
curl \
142+
--location \
143+
--silent \
144+
--show-error \
145+
--fail-with-body \
146+
https://archive.neon.kde.org/public.key |
147+
sudo gpg --dearmor -o /usr/share/keyrings/neon-archive-keyring.gpg
147148
# Add KDE neon repository
148-
echo "deb [signed-by=/usr/share/keyrings/neon-archive-keyring.gpg] http://archive.neon.kde.org/user noble main" | sudo tee /etc/apt/sources.list.d/neon.list
149+
echo "deb [signed-by=/usr/share/keyrings/neon-archive-keyring.gpg] \
150+
http://archive.neon.kde.org/user noble main" |
151+
sudo tee /etc/apt/sources.list.d/neon.list
149152
# Update package list
150153
sudo apt-get update
151154
@@ -157,7 +160,6 @@ jobs:
157160
${{ matrix.compiler_package }}
158161
${{ env.common_packages }}
159162
${{ matrix.with_qt6 && env.qt6_packages || env.qt5_packages }}
160-
${{ matrix.with_native_notifications && matrix.with_qt6 && env.kf6_packages || '' }}
161163
${{ matrix.coverage && 'lcov' || '' }}
162164
${{ matrix.coverage && 'kwin-wayland kwin-wayland-backend-virtual procps' || '' }}
163165
@@ -172,7 +174,7 @@ jobs:
172174
'-DCMAKE_CXX_FLAGS=${{matrix.compiler_flags}}',
173175
'-DCMAKE_C_FLAGS=${{matrix.compiler_flags}}',
174176
'-DWITH_QT6=${{matrix.with_qt6}}',
175-
'-DWITH_NATIVE_NOTIFICATIONS=${{matrix.with_native_notifications}}'
177+
'-DWITH_NATIVE_NOTIFICATIONS=ON'
176178
]
177179
178180
- name: Get AppImage tools

0 commit comments

Comments
 (0)