diff options
| author | Logan Rathbone <poprocks@gmail.com> | 2023-01-26 19:33:49 -0500 |
|---|---|---|
| committer | Logan Rathbone <poprocks@gmail.com> | 2023-01-26 19:33:49 -0500 |
| commit | b33e643229f4b03ca6943edc2b2c2dff7967bdd2 (patch) | |
| tree | 95d1ba24baaface207f61ff215178f339c3afed6 /.gitlab-ci.yml | |
| parent | 92eca1e32d433fd4ce45abb0b62306b1d6e0339f (diff) | |
| parent | a0c55e36136eb4469156f57877829ea39c016cbb (diff) | |
| download | zenity-b33e643229f4b03ca6943edc2b2c2dff7967bdd2.tar.gz | |
Merge branch 'gtk4-port'
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 369b809..d7a9b29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,28 +1,10 @@ variables: - FEDORA_DEPENDENCIES: gettext gettext-devel gcc redhat-rpm-config meson libtool git - gtk3-devel yelp-tools - - 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 + DEPENDENCIES: gettext gettext-devel gcc git libadwaita-devel meson gtk4-devel yelp-tools webkit2gtk5.0-devel build_fedora: image: fedora:latest before_script: - 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 + - meson -Dwebkitgtk=true build/ + - ninja -C build/ |