From 893e88c8f2e498b79748a793a02b455908639b98 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Tue, 19 Nov 2019 14:23:09 +0100
Subject: [PATCH] Test on more Rust releases

---
 .gitlab-ci.yml | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab34746..22cd0dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,32 @@
-build:
+build:webpack:
+  stage: build
+  image: node:12.13
+  script:
+  - npm ci
+  - node_modules/.bin/webpack
+  artifacts:
+    paths:
+    - static
+    - entry
+
+build:release: &build
+  stage: test
   image: rust:latest
   script:
-  - &init
-    - apt update
-    - apt install -y npm
-    - rustc --version && cargo --version
-    - npm ci
-    - node_modules/.bin/webpack
+  - &init rustc --version && cargo --version
   - cargo build --release --verbose
   artifacts:
     paths:
+    - target/release/pastebinrun
     - migrations
     - static
-    - target/release/pastebinrun
   cache:
     key: release
     paths:
-    - target/
+    - target
 
 test:stable: &test
+  stage: test
   services:
   - postgres
   variables:
@@ -30,6 +38,14 @@ test:stable: &test
   - *init
   - DATABASE_URL=postgresql://user:password@postgres/db cargo test --verbose --features=database_tests
   cache:
-    key: debug
+    key: ${CI_JOB_NAME}
     paths:
     - target/
+
+test:1.39:
+  <<: *test
+  image: rust:1.39
+
+test:nightly:
+  <<: *test
+  image: rustlang/rust:nightly