From c58ea2cc638c62ae9d27e6cd6cfe4c6af1e93925 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Mon, 2 Mar 2020 19:51:55 +0200
Subject: [PATCH] Minor CI fix

---
 .gitlab-ci.yml | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2671a3b..f2a7ea1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
 stages:
     - setup
     - lint
-    - test
     - build
+    - test
     - publish
     - deploy
 
@@ -31,34 +31,18 @@ sass:lint:
     script:
         - npm run lint:sass
 
-build:
-    image: node:12
-    needs: ["install"]
-    stage: lint
-    script:
-        - API_URL=http://web.sik.party:8000/api npm run build
-
 # test:unit:
 #     image: node:12
 #     stage: test
 #     script:
 #         - npm run test:unit
 
-test:e2e:
-    image: circleci/node:12-browsers
-    needs: ["install"]
-    stage: test
-    only:
-        - master
-    script:
-        - API_URL=http://web.sik.party:8000/api npm run test:e2e
-
 build:
     image: node:12
     needs: ["install"]
     stage: build
     script:
-        - npm run build
+        - API_URL=http://web.sik.party:8000/api npm run build
     dependencies:
         - install
     artifacts:
@@ -66,6 +50,15 @@ build:
             - dist
         expire_in: 1 week
 
+test:e2e:
+    image: circleci/node:12-browsers
+    needs: ["install", "build"]
+    stage: test
+    only:
+        - master
+    script:
+        - npm run test:e2e
+
 publish:dev:
     stage: publish
     image: docker:stable