From f289f0c8cf8c722cbcdc1885252a14c3bc843409 Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Mon, 20 Mar 2023 16:20:36 +0000
Subject: [PATCH] chore: rework pipelines
---
.gitlab-ci.yml | 36 ++++++++++++++++++++----------------
.vscode/settings.json | 2 ++
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d81d18a..71c42df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,24 @@ sast:
include:
- template: Security/SAST.gitlab-ci.yml
+unit-test:
+ image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.14.2-alpine3.14
+ stage: test
+ before_script:
+ - apk add git
+ - apk add bash
+ script:
+ - yarn
+ - yarn test --ci --reporters=default --reporters=jest-junit --coverage
+ coverage: "/All files[^|]*\\|[^|]*\\s+([\\d\\.]+)/"
+ artifacts:
+ reports:
+ junit:
+ - junit.xml
+ only:
+ - merge_requests
+ - main
+
build-dev:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.14.2-alpine3.14
stage: build
@@ -36,22 +54,8 @@ build-dev:
- git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/web-et-numerique/factory/llle_project/enedis-sge-konnector.git
- git config --global credential.helper store
- yarn deploy-dev
-
-unit-test:
- image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.14.2-alpine3.14
- stage: test
- before_script:
- - apk add git
- - apk add bash
- script:
- - yarn
- - yarn test --ci --reporters=default --reporters=jest-junit --coverage
- coverage: "/All files[^|]*\\|[^|]*\\s+([\\d\\.]+)/"
- artifacts:
- when: always
- reports:
- junit:
- - junit.xml
+ only:
+ - merge_requests
build:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:16.14.2-alpine3.14
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7d713c0..36fb84c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -29,11 +29,13 @@
"Arret",
"backoffice",
"catched",
+ "cicid",
"Corrigees",
"cozyclient",
"criteres",
"Derniere",
"Detaillees",
+ "ecolyo",
"enedis",
"Enedis",
"enedissgegrandlyon",
--
GitLab