summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2024-07-21 19:58:31 +0200
committerJörg Frings-Fürst <debian@jff.email>2024-07-21 19:58:31 +0200
commit5a514d891db203b803a37c2110184f537fcd5608 (patch)
tree0c85f179d5cfeb471f3227bd4a94998e3aaf4ee1 /.gitlab-ci.yml
parent408791709f23be34de957320384d02b228ea488f (diff)
parent35c7b263d4fc6910be51005193095cfbdeaa969a (diff)
Merge branch 'release/debian/46.0-1'HEADdebian/46.0-1master
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15a10c0..f7cea83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,14 @@ build:snap:
artifacts:
paths: ['./*.snap']
expire_in: 3 days
+ # TODO: Fix GTK4 snap package build
+ allow_failure: true
build-ubuntu:
image: ubuntu:rolling
before_script:
- apt-get update
- - DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends meson valac gcc gettext itstool libfribidi-dev libgirepository1.0-dev libgtk-3-dev libgusb-dev libcolord-dev libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates
+ - DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends meson valac gcc gettext itstool libfribidi-dev libgirepository1.0-dev libgtk-4-dev libadwaita-1-dev libgusb-dev libcolord-dev libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates
script:
- meson _build
- ninja -C _build install
@@ -20,7 +22,7 @@ build-ubuntu:
build-fedora:
image: fedora:latest
before_script:
- - dnf install -y meson vala gettext itstool fribidi-devel gtk3-devel gobject-introspection-devel libgusb-devel colord-devel PackageKit-glib-devel libwebp-devel sane-backends-devel git
+ - dnf install -y meson vala gettext itstool fribidi-devel gtk4-devel libadwaita-devel gobject-introspection-devel libgusb-devel colord-devel PackageKit-glib-devel libwebp-devel sane-backends-devel git
script:
- meson _build
- ninja -C _build install
@@ -28,7 +30,7 @@ build-fedora:
build-arch:
image: archlinux/base:latest
before_script:
- - pacman -Syu --noconfirm meson vala gettext itstool fribidi gtk3 gobject-introspection libgusb colord libwebp sane git
+ - pacman -Syu --noconfirm meson vala gettext itstool fribidi gtk4 libadwaita gobject-introspection libgusb colord libwebp sane git
script:
- meson _build
- ninja -C _build install
@@ -42,8 +44,6 @@ flatpak:
FLATPAK_MODULE: "simple-scan"
APP_ID: "org.gnome.SimpleScan"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
- BUNDLE: "simple-scan-dev.flatpak"
+ BUNDLE: "simple-scan.flatpak"
extends: '.flatpak'
- # Make CI pass while I figure things out
- allow_failure: true