فهرست منبع

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
Martijn Braam 2 سال پیش
والد
کامیت
3c4aaf9fb5
2فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 1 1
      .gitlab-ci.yml
  2. 1 1
      meson.build

+ 1 - 1
.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

+ 1 - 1
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',