Skip to content

Commit 66eb733

Browse files
committed
chore: update ci to use new docker images and Qt6
1 parent e68038b commit 66eb733

1 file changed

Lines changed: 25 additions & 28 deletions

File tree

.github/workflows/compile-and-test.yml

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
6767

6868
runs-on: ubuntu-latest
69-
container: ghcr.io/kdab/hotspot-archlinux-dependencies
69+
container: ghcr.io/kdab/hotspot-archlinuxqt6-dependencies
7070

7171
steps:
7272
- name: Checkout
@@ -75,21 +75,21 @@ jobs:
7575
submodules: recursive
7676

7777
- name: Configure
78-
run: cmake --preset dev-asan
78+
run: cmake --preset dev-asan-qt6
7979
-DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
8080

8181
- name: Build
82-
run: cmake --build --preset dev-asan
82+
run: cmake --build --preset dev-asan-qt6
8383

8484
- name: Test
85-
run: ctest --preset dev-asan
85+
run: ctest --preset dev-asan-qt6
8686

8787
archlinux-clang-clazy:
8888
needs: pre_job
8989
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
9090

9191
runs-on: ubuntu-latest
92-
container: ghcr.io/kdab/hotspot-archlinux-dependencies
92+
container: ghcr.io/kdab/hotspot-archlinuxqt6-dependencies
9393

9494
steps:
9595
- name: Checkout
@@ -98,20 +98,20 @@ jobs:
9898
submodules: recursive
9999

100100
- name: Configure
101-
run: cmake --preset dev-clazy
101+
run: cmake --preset dev-clazy-qt6
102102

103103
- name: Build
104-
run: cmake --build --preset dev-clazy
104+
run: cmake --build --preset dev-clazy-qt6
105105

106106
- name: Test
107-
run: ctest --preset dev-clazy
107+
run: ctest --preset dev-clazy-qt6
108108

109109
archlinux-clang-tidy:
110110
needs: pre_job
111111
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
112112

113113
runs-on: ubuntu-latest
114-
container: ghcr.io/kdab/hotspot-archlinux-dependencies
114+
container: ghcr.io/kdab/hotspot-archlinuxqt6-dependencies
115115

116116
steps:
117117
- name: Checkout
@@ -120,14 +120,14 @@ jobs:
120120
submodules: recursive
121121

122122
- name: Configure
123-
run: cmake --preset dev-clazy
123+
run: cmake --preset dev-clazy-qt6
124124

125125
- name: Analyze
126126
# the first lines ensures all moc generated headers are available
127-
run: cd build-dev-clazy &&
127+
run: cd build-dev-clazy-qt6 &&
128128
ninja -t targets all | grep "mocs_compilation.cpp:" | cut -f1 -d':' | xargs ninja &&
129129
cd .. &&
130-
./scripts/run_clang_tidy.sh build-dev-clazy &&
130+
./scripts/run_clang_tidy.sh build-dev-clazy-qt6 &&
131131
[ ! -s scripts/fixits/fixits.yaml ]
132132

133133
- name: Upload Fixits
@@ -142,7 +142,7 @@ jobs:
142142
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
143143

144144
runs-on: ubuntu-latest
145-
container: ghcr.io/kdab/hotspot-archlinuxwithoutoptional-dependencies
145+
container: ghcr.io/kdab/hotspot-archlinuxwithoutoptionalqt6-dependencies
146146

147147
steps:
148148
- name: Checkout
@@ -151,21 +151,20 @@ jobs:
151151
submodules: recursive
152152

153153
- name: Configure
154-
run: cmake --preset dev-asan
155-
-DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
154+
run: cmake --preset dev-asan-qt6 -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
156155

157156
- name: Build
158-
run: cmake --build --preset dev-asan
157+
run: cmake --build --preset dev-asan-qt6
159158

160159
- name: Test
161-
run: ctest --preset dev-asan
160+
run: ctest --preset dev-asan-qt6
162161

163-
fedora34:
162+
fedora42:
164163
needs: pre_job
165164
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
166165

167166
runs-on: ubuntu-latest
168-
container: ghcr.io/kdab/hotspot-fedora34-dependencies
167+
container: ghcr.io/kdab/hotspot-fedora42qt6-dependencies
169168

170169
steps:
171170
- name: Checkout
@@ -174,22 +173,20 @@ jobs:
174173
submodules: recursive
175174

176175
- name: Configure
177-
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -G Ninja
178-
-DCMAKE_CXX_FLAGS_INIT="-g -fsanitize=address,undefined -Werror"
179-
-DCMAKE_C_FLAGS_INIT="-g -fsanitize=address,undefined -Werror"
176+
run: cmake --preset dev-asan-qt6 -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
180177

181178
- name: Build
182-
run: cmake --build build
179+
run: cmake --build --preset dev-asan-qt6
183180

184181
- name: Test
185-
run: ctest --test-dir build --output-on-failure
182+
run: ctest --preset dev-asan-qt6
186183

187184
opensuse-tumbleweed:
188185
needs: pre_job
189186
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
190187

191188
runs-on: ubuntu-latest
192-
container: ghcr.io/kdab/hotspot-opensusetumbleweed-dependencies
189+
container: ghcr.io/kdab/hotspot-opensusetumbleweedqt6-dependencies
193190

194191
steps:
195192
- name: Checkout
@@ -198,13 +195,13 @@ jobs:
198195
submodules: recursive
199196

200197
- name: Configure
201-
run: cmake --preset dev-asan -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
198+
run: cmake --preset dev-asan-qt6 -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
202199

203200
- name: Build
204-
run: cmake --build --preset dev-asan
201+
run: cmake --build --preset dev-asan-qt6
205202

206203
- name: Test
207-
run: ctest --preset dev-asan
204+
run: ctest --preset dev-asan-qt6
208205

209206
neon-qt6:
210207
needs: pre_job

0 commit comments

Comments
 (0)