From 822a72efde554ea093e575f167953f145eb67c10 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Tue, 27 Mar 2018 10:04:02 +0300
Subject: [PATCH] gitlabci: Enable the ubuntu/rust stable build, disable tests
 in flatpak

Due to meson not understanding cargo, it's actually faster to have
a separate build + test job than trying to compile the cargo
tests twice inside the flatpak enviroment
---
 .gitlab-ci.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cd9aa2..a2bb8e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 stages:
-  - flatpak
   - test
   - lint
 
@@ -36,15 +35,12 @@ stages:
             - target/
             - .cargo_cache/
 
-stable:test:
+rust:stable:
     # https://hub.docker.com/_/rust/
     image: "rust"
     <<: *cargo_test
-    only:
-        - schedule
-        - web
 
-nightly:test:
+rust:nightly:
     # https://hub.docker.com/r/rustlang/rust/
     image: "rustlang/rust:nightly"
     <<: *cargo_test
@@ -54,7 +50,7 @@ nightly:test:
 
 flatpak:
     image: registry.gitlab.com/alatiera/gnome-nightly-oci/rust-bundle:latest
-    stage: flatpak
+    stage: test
     script:
         - flatpak-builder --stop-at=hammond app org.gnome.Hammond.json
         # https://gitlab.gnome.org/alatiera/Hammond/issues/55
@@ -70,8 +66,8 @@ flatpak:
         # Create a flatpak bundle
         - flatpak build-bundle repo hammond-dev.flatpak org.gnome.Hammond
         # Run the tests
-        - flatpak-builder --run app org.gnome.Hammond.json cargo test --release -- --test-threads=1
-        - flatpak-builder --run app org.gnome.Hammond.json cargo test --release -- --test-threads=1 --ignored
+        # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1
+        # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1 --ignored
 
     artifacts:
         paths: