|
40 | 40 | libqt6svg6-dev |
41 | 41 | libqt6svg6 |
42 | 42 |
|
43 | | - libkf6guiaddons |
44 | 43 | libkf6guiaddons-dev |
45 | 44 | libkf6notifications-dev |
46 | | - libkf6statusnotifieritem-dev |
| 45 | + kf6-kstatusnotifieritem-dev |
47 | 46 |
|
48 | 47 | libqt6waylandclient6 |
49 | 48 | qt6-wayland |
@@ -80,35 +79,35 @@ jobs: |
80 | 79 | fail-fast: false |
81 | 80 | matrix: |
82 | 81 | include: |
83 | | - - os: ubuntu-22.04 |
84 | | - buildname: Qt 5 |
85 | | - compiler: g++ |
86 | | - compiler_package: g++ |
87 | | - with_qt6: false |
88 | | - test_x11: true |
89 | | - cmake_preset: Debug |
90 | | - |
91 | | - - os: ubuntu-latest |
92 | | - buildname: Qt 6 |
93 | | - compiler: g++ |
94 | | - compiler_package: g++ |
95 | | - with_qt6: true |
96 | | - test_x11: true |
97 | | - test_wayland: true |
98 | | - coverage: true |
99 | | - cmake_preset: Debug |
100 | | - compiler_flags: >- |
101 | | - --coverage |
102 | | - -fprofile-arcs |
103 | | - -ftest-coverage |
104 | | - -fprofile-abs-path |
105 | | -
|
106 | | - - os: ubuntu-latest |
107 | | - buildname: Qt 6 Clang |
108 | | - compiler: clang++ |
109 | | - compiler_package: clang |
110 | | - with_qt6: true |
111 | | - cmake_preset: Debug |
| 82 | + # - os: ubuntu-22.04 |
| 83 | + # buildname: Qt 5 |
| 84 | + # compiler: g++ |
| 85 | + # compiler_package: g++ |
| 86 | + # with_qt6: false |
| 87 | + # test_x11: true |
| 88 | + # cmake_preset: Debug |
| 89 | + # |
| 90 | + # - os: ubuntu-latest |
| 91 | + # buildname: Qt 6 |
| 92 | + # compiler: g++ |
| 93 | + # compiler_package: g++ |
| 94 | + # with_qt6: true |
| 95 | + # test_x11: true |
| 96 | + # test_wayland: true |
| 97 | + # coverage: true |
| 98 | + # cmake_preset: Debug |
| 99 | + # compiler_flags: >- |
| 100 | + # --coverage |
| 101 | + # -fprofile-arcs |
| 102 | + # -ftest-coverage |
| 103 | + # -fprofile-abs-path |
| 104 | + # |
| 105 | + # - os: ubuntu-latest |
| 106 | + # buildname: Qt 6 Clang |
| 107 | + # compiler: clang++ |
| 108 | + # compiler_package: clang |
| 109 | + # with_qt6: true |
| 110 | + # cmake_preset: Debug |
112 | 111 |
|
113 | 112 | - os: ubuntu-latest |
114 | 113 | buildname: AppImage |
@@ -146,22 +145,31 @@ jobs: |
146 | 145 | https://archive.neon.kde.org/public.key | |
147 | 146 | sudo gpg --dearmor -o /usr/share/keyrings/neon-archive-keyring.gpg |
148 | 147 | # Add KDE neon repository |
149 | | - echo "deb [signed-by=/usr/share/keyrings/neon-archive-keyring.gpg] \ |
150 | | - http://archive.neon.kde.org/user noble main" | |
| 148 | + echo "deb [signed-by=/usr/share/keyrings/neon-archive-keyring.gpg] https://archive.neon.kde.org/stable noble main" | |
151 | 149 | sudo tee /etc/apt/sources.list.d/neon.list |
152 | 150 | # Update package list |
153 | 151 | sudo apt-get update |
154 | 152 |
|
155 | 153 | - name: Install dependencies |
156 | | - uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # v1 |
157 | | - with: |
158 | | - version: 1.0 |
159 | | - packages: >- |
| 154 | + env: |
| 155 | + PACKAGES: >- |
160 | 156 | ${{ matrix.compiler_package }} |
161 | 157 | ${{ env.common_packages }} |
162 | 158 | ${{ matrix.with_qt6 && env.qt6_packages || env.qt5_packages }} |
163 | 159 | ${{ matrix.coverage && 'lcov' || '' }} |
164 | 160 | ${{ matrix.coverage && 'kwin-wayland kwin-wayland-backend-virtual procps' || '' }} |
| 161 | + run: sudo apt install -y $PACKAGES |
| 162 | + |
| 163 | + # - name: Install dependencies |
| 164 | + # uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # v1 |
| 165 | + # with: |
| 166 | + # version: 1.0 |
| 167 | + # packages: >- |
| 168 | + # ${{ matrix.compiler_package }} |
| 169 | + # ${{ env.common_packages }} |
| 170 | + # ${{ matrix.with_qt6 && env.qt6_packages || env.qt5_packages }} |
| 171 | + # ${{ matrix.coverage && 'lcov' || '' }} |
| 172 | + # ${{ matrix.coverage && 'kwin-wayland kwin-wayland-backend-virtual procps' || '' }} |
165 | 173 |
|
166 | 174 | - name: Build with CMake |
167 | 175 | uses: lukka/run-cmake@af1be47fd7c933593f687731bc6fdbee024d3ff4 # v10 |
@@ -199,8 +207,6 @@ jobs: |
199 | 207 | ${{runner.workspace}}/build/copyq/${{ matrix.cmake_preset }}/AppDir |
200 | 208 | EXTRA_QT_MODULES: >- |
201 | 209 | svg |
202 | | - EXTRA_PLATFORM_PLUGINS: >- |
203 | | - libqwayland-egl.so;libqwayland-generic.so |
204 | 210 | run: | |
205 | 211 | ./linuxdeploy-x86_64.AppImage \ |
206 | 212 | --plugin qt \ |
|
0 commit comments