From c8c0699d9ca533d4e8f3ca100e58cf3b8424e9a0 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Tue, 5 Dec 2017 07:37:43 +0200
Subject: [PATCH] gitlab-ci tweak.

---
 .gitlab-ci.yml         | 12 ++++++++----
 org.gnome.Hammond.json |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9fdf03..d4a490f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,19 +38,21 @@ variables:
 #   - ./configure --prefix=/usr/local
 #   - make && sudo make install
 
-test:stable:
+stable:test:
   # Stable img
   # https://hub.docker.com/_/rust/
   image: "rust"
+  stage: test
   script:
   - rustc --version && cargo --version
   - cargo build
   - cargo test --verbose -- --test-threads=1
 
-test:nightly:
+nightly:test:
   # Nightly
   # https://hub.docker.com/r/rustlang/rust/
   image: "rustlang/rust:nightly"
+  stage: test
   script:
   - rustc --version && cargo --version
   - cargo build
@@ -59,8 +61,9 @@ test:nightly:
 
 # Configure and run rustfmt on nightly
 # Exits and builds fails if on bad format
-lint:rustfmt:
+rustfmt:
   image: "rustlang/rust:nightly"
+  stage: lint
   script:
   - rustc --version && cargo --version
   - cargo install rustfmt-nightly
@@ -68,8 +71,9 @@ lint:rustfmt:
 
 # Configure and run clippy on nightly
 # Only fails on errors atm.
-lint:clippy:
+clippy:
   image: "rustlang/rust:nightly"
+  stage: lint
   script:
   - rustc --version && cargo --version
   - cargo install clippy
diff --git a/org.gnome.Hammond.json b/org.gnome.Hammond.json
index 09b1936..ea403fc 100644
--- a/org.gnome.Hammond.json
+++ b/org.gnome.Hammond.json
@@ -30,7 +30,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/alatiera/Hammond.git",
-                    "branch": "client-rework"
+                    "branch": "master"
                 }
             ]
         }