From 5a0413b3e439ca3cfbc604f7d459116e5a5ae84c Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 16 Aug 2018 03:26:16 +0300 Subject: [PATCH] CI: Remove --libdir=/app/libdir from meson config This is not needed anymore I think. --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42d7833..0a9a604 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ flatpak: - flatpak-builder --run app org.gnome.Podcasts.json glib-compile-resources --sourcedir=podcasts-gtk/resources/ podcasts-gtk/resources/resources.xml # Build the flatpak repo - - flatpak-builder --run app org.gnome.Podcasts.json meson --prefix=/app --libdir=/app/lib _build + - flatpak-builder --run app org.gnome.Podcasts.json meson --prefix=/app _build - flatpak-builder --run app org.gnome.Podcasts.json ninja -C _build install - flatpak-builder --finish-only app org.gnome.Podcasts.json - flatpak build-export repo app @@ -24,11 +24,14 @@ flatpak: # Run the tests - | flatpak-builder --run \ - --env=CARGO_HOME="./target/cargo-home/" \ + --env=CARGO_HOME="target/cargo-home/" \ --env=RUSTFLAGS="--cfg rayon_unstable" \ app org.gnome.Podcasts.json \ cargo test -- --test-threads=1 + - ls -alR + - tree -d + # - flatpak-builder --run app org.gnome.Podcasts.json cargo test -- --test-threads=1 --ignored # Create a flatpak bundle