summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2018-07-30 17:10:58 +0200
committerBastien Nocera <hadess@hadess.net>2018-07-31 12:56:26 +0200
commit9c159b4c34a0774dd9d760d580e75f96b2a27c7b (patch)
tree4181f5a6b03d8b32bbdda1feebeb7dc3b04a1d95 /.gitlab-ci.yml
parent60c58aed0b011947a846c6681750a30243152fc2 (diff)
downloadtotem-9c159b4c34a0774dd9d760d580e75f96b2a27c7b.tar.gz
build: Test Flatpak builds in CI as well
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml15
1 files changed, 14 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9af8d6865..d91897263 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,21 @@
build-fedora:
image: fedora:latest
before_script:
- - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc intltool itstool libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel meson nautilus-devel pygobject3-devel pylint python3-devel totem-pl-parser-devel vala
+ - dnf install -y redhat-rpm-config meson git cairo-devel clutter-devel clutter-gst3-devel clutter-gtk-devel gcc-c++ gettext gnome-desktop3-devel grilo-devel gsettings-desktop-schemas-devel gstreamer1-devel gstreamer1-plugins-base-devel gstreamer1-plugins-good gtk3-devel gtk-doc intltool itstool libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel meson nautilus-devel pygobject3-devel pylint python3-devel totem-pl-parser-devel vala flatpak-builder
script:
- meson _build -Denable-vala=no
- ninja -C _build test
- ninja -C _build install
+
+ # Check that https://github.com/mesonbuild/meson/issues/1994 work-around still works
+ - rm -rf _build
+ - meson _build -Denable-vala=yes
+ - ninja -C _build -j1
+
+build-flatpak:
+ image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+ script:
+ # Flatpak build
+ - rm -rf _build ; mkdir _build
+ - rm -rf _repo ; mkdir _repo
+ - flatpak-builder --ccache --force-clean _build flatpak/org.gnome.Totem.json --repo=_repo