~exec64/imv

8615f4d39a0fdc4c0729265ded42a33f0931a678 — Harry Jeffery 3 months ago 8482218 v4.5.0-dev
Fix CI builds
5 files changed, 18 insertions(+), 24 deletions(-)

M .builds/archlinux.yml
M .builds/debian.yml
M .builds/fedora.yml
M .builds/freebsd.yml
M .builds/ubuntu.yml
M .builds/archlinux.yml => .builds/archlinux.yml +3 -3
@@ 11,7 11,6 @@ packages:
  - libinih
  - libjpeg-turbo
  - libjxl
  - libnsgif
  - libpng
  - librsvg
  - libtiff


@@ 25,9 24,10 @@ packages:
sources:
  - https://git.sr.ht/~exec64/imv
tasks:
  # arch ships libnsgif 1.0.0 which is too new
  - gcc: |
      CC=gcc meson imv build_gcc -D auto_features=enabled
      CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled
      CC=gcc ninja -C build_gcc test
  - clang: |
      CC=clang meson imv build_clang -D auto_features=enabled
      CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled
      CC=clang ninja -C build_clang test

M .builds/debian.yml => .builds/debian.yml +7 -13
@@ 25,16 25,10 @@ packages:
sources:
  - https://git.sr.ht/~exec64/imv
tasks:
  - dummy: |
      true
#FIXME:
# the old meson package in debian has a bug and crashes with
# our meson.build; re-enable this once debian packages a version
# newer than 0.49.2
      # libnsgif isn't packaged by debian
# - gcc: |
#     CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled
#     CC=gcc ninja -C build_gcc test
# - clang: |
#     CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled
#     CC=clang ninja -C build_clang test
  # libnsgif isn't packaged by debian
  - gcc: |
      CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled
      CC=gcc ninja -C build_gcc test
  - clang: |
      CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled
      CC=clang ninja -C build_clang test

M .builds/fedora.yml => .builds/fedora.yml +3 -3
@@ 6,6 6,7 @@ packages:
  - inih
  - libX11-devel
  - libcmocka-devel
  - libheif-devel
  - libicu-devel
  - libjxl-devel
  - libpng-devel


@@ 24,11 25,10 @@ packages:
sources:
  - https://git.sr.ht/~exec64/imv
tasks:
  # libheif ins't packaged by fedora
  # libnsgif isn't packaged by fedora
  - gcc: |
      CC=gcc meson imv build_gcc -D auto_features=enabled -D libheif=disabled -D libnsgif=disabled
      CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled
      CC=gcc ninja -C build_gcc test
  - clang: |
      CC=clang meson imv build_clang -D auto_features=enabled -D libheif=disabled -D libnsgif=disabled
      CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled
      CC=clang ninja -C build_clang test

M .builds/freebsd.yml => .builds/freebsd.yml +2 -2
@@ 8,7 8,6 @@ packages:
  - graphics/libheif
  - graphics/libjpeg-turbo
  - graphics/libjxl
  - graphics/libnsgif
  - graphics/librsvg2-rust
  - graphics/png
  - graphics/tiff


@@ 20,6 19,7 @@ packages:
sources:
  - https://git.sr.ht/~exec64/imv
tasks:
  # freebsd ships libnsgif 1.0.0 which is too new
  - meson: |
      meson imv build -D auto_features=enabled -D c_link_args='-L/usr/local/lib'
      meson imv build -D auto_features=enabled -D libnsgif=disabled -D c_link_args='-L/usr/local/lib'
      ninja -C build test

M .builds/ubuntu.yml => .builds/ubuntu.yml +3 -3
@@ 9,7 9,6 @@ packages:
  - libheif-dev
  - libicu-dev
  - libinih-dev
  - libjxl-dev
  - libpango1.0-dev
  - libpng-dev
  - librsvg2-dev


@@ 26,9 25,10 @@ sources:
  - https://git.sr.ht/~exec64/imv
tasks:
  # libnsgif isn't packaged by ubuntu
  # libjxl-dev isn't packaged by ubuntu lts
  - gcc: |
      CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled
      CC=gcc meson imv build_gcc -D auto_features=enabled -D libnsgif=disabled -D libjxl=disabled
      CC=gcc ninja -C build_gcc test
  - clang: |
      CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled
      CC=clang meson imv build_clang -D auto_features=enabled -D libnsgif=disabled -D libjxl=disabled
      CC=clang ninja -C build_clang test