From 14faa7994ee405b3578ad6e7991e12bb8228f143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20L=C3=B6fgren?= <victor.l0fgr3n@gmail.com>
Date: Tue, 16 Feb 2021 19:08:10 +0100
Subject: [PATCH] #5: Test needs instead of dependencies
---
.gitlab/client.gitlab-ci.yml | 13 ++++++-------
.gitlab/server.gitlab-ci.yml | 7 +++----
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/.gitlab/client.gitlab-ci.yml b/.gitlab/client.gitlab-ci.yml
index 56ecd760..f73fe000 100644
--- a/.gitlab/client.gitlab-ci.yml
+++ b/.gitlab/client.gitlab-ci.yml
@@ -1,4 +1,4 @@
-client-setup:
+client:setup:
image: node:10
stage: setup
script:
@@ -17,21 +17,20 @@ client-setup:
- client/.npm/
- client/node_modules/
-client-linting:
+client:linting:
image: node:10
stage: test
+ needs: ["client:setup"]
script:
- cd client
- npm run lint
- dependencies:
- - client-setup
-client-test:
+client:test:
image: node:10
stage: test
+ needs: ["client:setup"]
script:
- cd client
- npm run test:coverage
- dependencies:
- - client-setup
+
coverage: /All files\s*\|\s*([\d\.]+)/
diff --git a/.gitlab/server.gitlab-ci.yml b/.gitlab/server.gitlab-ci.yml
index 33959d12..e2913efb 100644
--- a/.gitlab/server.gitlab-ci.yml
+++ b/.gitlab/server.gitlab-ci.yml
@@ -1,4 +1,4 @@
-server-setup:
+server:setup:
image: python
stage: setup
artifacts:
@@ -18,11 +18,10 @@ server-setup:
- source env/bin/activate
- pip install -r requirements.txt
-server-test:
+server:test:
image: python
stage: test
- dependencies:
- - server-setup
+ needs: ["server:setup"]
script:
- cd server
- source env/bin/activate
--
GitLab