From d5f6c181af91e05027c24a3e2a8d1466cb044ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= <pep@bouah.net>
Date: Fri, 13 Sep 2019 03:26:06 +0200
Subject: [PATCH] CI: Refactor: split jobs, add tests, and caching
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
---
 .gitlab-ci.yml | 64 +++++++++++++++++++++++++++++++++++++++++++-------
 CHANGELOG.md   |  4 ++++
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a1213e..6996a55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,62 @@
 stages:
   - build
+  - test
 
-rust-latest:
-  stage: build
+variables:
+  FEATURES: ""
+  RUST_BACKTRACE: "full"
+
+.stable:
   image: rust:latest
-  script:
-    - cargo build --verbose --features=minidom
-    - cargo test --lib --verbose --features=minidom
+  cache:
+    key: stable
+    paths:
+      - target/
 
-rust-nightly:
-  stage: build
+.nightly:
   image: rustlang/rust:nightly
+  cache:
+    key: nightly
+    paths:
+      - target/
+
+.build:
+  stage: build
   script:
-    - cargo build --verbose --features=minidom
-    - cargo test --lib --verbose --features=minidom
+    - cargo build --verbose --no-default-features --features=$FEATURES
+
+.test:
+  stage: test
+  script:
+    - cargo test --lib --verbose --no-default-features --features=$FEATURES
+
+rust-latest-build:
+  extends:
+    - .build
+    - .stable
+
+rust-nightly-build:
+  extends:
+    - .build
+    - .nightly
+
+
+rust-latest-test:
+  extends:
+    - .test
+    - .stable
+
+rust-nightly-test:
+  extends:
+    - .test
+    - .nightly
+
+rust-latest-build with features=minidom:
+  extends: rust-latest-build
+  variables:
+    FEATURES: "minidom"
+
+rust-latest-test with features=minidom:
+  extends: rust-latest-test
+  variables:
+    FEATURES: "minidom"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1a83e5..70108af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+Version XXX, released YYY:
+  * Updates
+    - CI: Split jobs, add tests, and caching
+
 Version 0.7.2, released 2019-09-13:
   * Updates
     - Impl Error for JidParseError again, it got removed due to the failure removal but is still wanted.