From 377dca13042be90cb713a7501a2006c7606ba2d1 Mon Sep 17 00:00:00 2001
From: SamwiseFilmore <mggmugginsmc@gmail.com>
Date: Mon, 20 Aug 2018 22:19:19 +0000
Subject: [PATCH] Reconfigure CI

---
 .gitlab-ci.yml | 67 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 54 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90d5e9a..e60f6ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,66 @@
-before_script:
-  - apt-get update -qq
-  - apt-get install -qq build-essential curl git
-  - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
-  - source "$HOME/.cargo/env"
+image: "rust:latest"
 
-stable:
+stages:
+  - build
+  - test
+
+before_script:
+    - rustup toolchain add $toolchain
+
+cache:
+  paths:
+    - target/
+
+build:stable:
+  stage: build
+  variables:
+    toolchain: stable
   script:
     - cargo +stable build --verbose
+    - cargo +stable build --release --verbose
+
+test:stable:
+  stage: test
+  variables:
+    toolchain: stable
+  dependencies:
+    - build:stable
+  script:
     - script -q -c "cargo +stable test --verbose"
     - script -q -c "cargo +stable test --release --verbose"
 
-beta:
+build:beta:
+  stage: build
+  variables:
+    toolchain: beta
   script:
-    - rustup toolchain add beta
     - cargo +beta build --verbose
+    - cargo +beta build --release --verbose
+
+test:beta:
+  stage: test
+  variables:
+    toolchain: beta
+  dependencies:
+    - build:beta
+  script:
     - script -q -c "cargo +beta test --verbose"
     - script -q -c "cargo +beta test --release --verbose"
 
-nightly:
+build:nightly:
+  stage: build
+  variables:
+    toolchain: nightly
   script:
-  - rustup toolchain add nightly
-  - cargo +nightly build --verbose
-  - script -q -c "cargo +nightly test --verbose"
-  - script -q -c "cargo +nightly test --release --verbose"
+    - cargo +nightly build --verbose
+    - cargo +nightly build --release --verbose
+
+test:nightly:
+  stage: test
+  variables:
+    toolchain: nightly
+  dependencies:
+    - build:nightly
+  script:
+    - script -q -c "cargo +nightly test --verbose"
+    - script -q -c "cargo +nightly test --release --verbose"
\ No newline at end of file