From c6998e7834ec819f9ed95760695bef155c6d939b Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Fri, 5 Feb 2021 17:06:02 +0100
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3daf2ebb8..d504e6f0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,23 +17,28 @@ test:
stage: test
image: node:14.15.4
script:
- - yarn install
+ - yarn
- yarn cs test --ci --reporters=default --reporters=jest-junit
artifacts:
when: always
reports:
junit:
- junit.xml
+ only:
+ - dev
+ - master
+ - merge_requests
build:
stage: build
+ image: node:14.15.4
script:
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - docker build --pull -t "$CI_REGISTRY_IMAGE" .
- - docker push "$CI_REGISTRY_IMAGE"
+ - yarn
+ - yarn build
only:
- dev
- master
+ - merge_requests
build_stack:
stage: build
--
GitLab