From d73836db5142e3893ec59aeb077da05560c27d8a Mon Sep 17 00:00:00 2001
From: Albin Henriksson <albhe428@student.liu.se>
Date: Tue, 16 Feb 2021 15:36:49 +0100
Subject: [PATCH] #2: Removed unused stages

---
 .gitlab-ci.yml               |  3 ++-
 .gitlab/client.gitlab-ci.yml | 21 ++-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c7b2a5c..c07a74ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
-  - setup
+  - install
   - test
 
 include:
   - local: .gitlab/server.gitlab-ci.yml
+  - local: .gitlab/client.gitlab-ci.yml
diff --git a/.gitlab/client.gitlab-ci.yml b/.gitlab/client.gitlab-ci.yml
index 2d5697d6..81e0f1e1 100644
--- a/.gitlab/client.gitlab-ci.yml
+++ b/.gitlab/client.gitlab-ci.yml
@@ -1,10 +1,5 @@
 image: node:10
 
-stages:
-  - install
-  - build
-  - quality
-
 install:
   stage: install
   script:
@@ -18,20 +13,8 @@ install:
       - client/.npm/
       - client/node_modules/
 
-build:
-  stage: build
-  script:
-    - cd client
-    - CI=false npm run build
-  artifacts:
-    paths:
-      - client/build
-    expire_in: 60 mins
-  dependencies:
-    - install
-
 linting:
-  stage: quality
+  stage: test
   script:
     - cd client
     - npm run lint
@@ -39,7 +22,7 @@ linting:
     - install
 
 test:unit:
-  stage: quality
+  stage: test
   script:
     - cd client
     - npm run test:coverage
-- 
GitLab