From 3c4aaf9fb59df592dfe100f7ef8d55a272f7989d Mon Sep 17 00:00:00 2001 From: Martijn Braam Date: Tue, 21 Jun 2022 14:33:48 +0200 Subject: [PATCH] ci: Fix debian build 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 --- .gitlab-ci.yml | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49089cc..44e355e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ build:debian: image: debian:bookworm-slim 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: - meson build - ninja -C build diff --git a/meson.build b/meson.build index 47d516e..4e7d505 100644 --- a/meson.build +++ b/meson.build @@ -79,7 +79,7 @@ executable('megapixels-camera-test', install: true) # Formatting -clang_format = find_program('clang-format-12', required: false) +clang_format = find_program('clang-format-14', required: false) if clang_format.found() format_files = [ 'data/blit.frag',