summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJeremy Bicha <jeremy.bicha@canonical.com>2022-07-28 15:27:26 -0400
committerJeremy Bicha <jeremy.bicha@canonical.com>2022-07-28 15:27:26 -0400
commit4ce0a8ab5ae1521864291c63f11988e9c2cee44b (patch)
tree3dd99f82054cb9d8f368cde7a1330da194cc68f6 /.gitlab-ci.yml
parentNew upstream version 3.42.1 (diff)
parentZenity 3.43.0 (diff)
downloadzenity-4ce0a8ab5ae1521864291c63f11988e9c2cee44b.tar.gz
zenity-4ce0a8ab5ae1521864291c63f11988e9c2cee44b.tar.bz2
zenity-4ce0a8ab5ae1521864291c63f11988e9c2cee44b.zip
New upstream version 3.43.0
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml25
1 files changed, 21 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7437fd7a..369b8090 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,28 @@
variables:
- DEPENDENCIES: gettext gettext-devel gcc redhat-rpm-config meson libtool git
+ FEDORA_DEPENDENCIES: gettext gettext-devel gcc redhat-rpm-config meson libtool git
gtk3-devel yelp-tools
-build_fedora_33:
- image: fedora:33
+ UBUNTU_DEPENDENCIES: meson git gcc gettext libtool libnotify-dev libgtk-3-dev
+ libwebkit2gtk-4.1-dev yelp-tools
+
+# Fedora does a plain vanilla build in its specfile with no meson options
+# https://src.fedoraproject.org/rpms/zenity/blob/rawhide/f/zenity.spec
+
+build_fedora:
+ image: fedora:latest
before_script:
- - dnf install -y --nogpgcheck $DEPENDENCIES
+ - dnf install -y --nogpgcheck $FEDORA_DEPENDENCIES
script:
- meson --buildtype=debug build
- ninja -v -C build
+
+# Ubuntu image here is mostly to test whether the webkitgtk build works
+
+build_ubuntu:
+ image: ubuntu:rolling
+ before_script:
+ - apt-get update
+ - apt-get install -q -y --no-install-recommends $UBUNTU_DEPENDENCIES
+ script:
+ - meson --buildtype=debug -Dlibnotify=true -Dwebkitgtk=true build
+ - ninja -v -C build
bgstack15