diff options
author | Bastien Nocera <hadess@hadess.net> | 2019-02-08 12:49:42 +0100 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2019-02-08 15:34:40 +0100 |
commit | 627c1ee182eaf2b394d69cd3c6ea560136b3d731 (patch) | |
tree | 13c42e8047148a557056dc704caf48d167005121 /.gitlab-ci.yml | |
parent | c3d8faeb6a19460afbddd310578db0f372c5e1c9 (diff) | |
download | totem-627c1ee182eaf2b394d69cd3c6ea560136b3d731.tar.gz |
build: Remove vala option
After the last vala plugin was ported, we don't need an option to build
Vala plugins.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 127f033ff..ce6035db2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,17 +6,12 @@ build-fedora: image: fedora:latest stage: test 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 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 + - 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 itstool libappstream-glib liberation-sans-fonts libpeas-devel lirc-devel meson nautilus-devel pygobject3-devel pylint python3-devel totem-pl-parser-devel flatpak-builder script: - - meson _build -Denable-vala=no + - meson _build - 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 - variables: # Replace with your preferred file name of the resulting Flatpak bundle BUNDLE: "org.gnome.TotemDevel.flatpak" @@ -33,7 +28,7 @@ flatpak: FLATPAK_MODULE: "totem" # Make sure to keep this in sync with the Flatpak manifest, all arguments # are passed except the config-args because we build it ourselves - MESON_ARGS: "-Denable-vala=no -Denable-easy-codec-installation=no" + MESON_ARGS: "-Denable-easy-codec-installation=no" DBUS_ID: "org.gnome.Totem" script: |