colin/Megapixels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Fix debian build

Browse Source 
The clang-format-12 package no longer exist and only clang-format 11, 13
and 14 remain in the repositories.

Also replace apt with apt-get since apt is not for scripting
This commit is contained in:
Martijn Braam
2022-06-21 14:33:48 +02:00
parent f66fcc5a71
commit 3c4aaf9fb5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -1,7 +1,7 @@
build:debian: build:debian:
image: debian:bookworm-slim image: debian:bookworm-slim
before_script: before_script:
- apt update && apt -y install gcc meson ninja-build clang-format-12 libgtk-4-dev libtiff-dev libzbar-dev - apt-get update && apt-get -y install gcc meson ninja-build git clang-format-14 libgtk-4-dev libtiff-dev libzbar-dev
script: script:
- meson build - meson build
- ninja -C build - ninja -C build

2
meson.build
View File

@@ -79,7 +79,7 @@ executable('megapixels-camera-test',
install: true) install: true)
# Formatting # Formatting
clang_format = find_program('clang-format-12', required: false) clang_format = find_program('clang-format-14', required: false)
if clang_format.found() if clang_format.found()
format_files = [ format_files = [
'data/blit.frag', 'data/blit.frag',