From 8e1c4a2e8c5f20bd7ba47719fd1cec1ce0a4590b Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Wed, 24 Mar 2021 17:57:39 +0100
Subject: [PATCH] update gitlab ci
---
.gitlab-ci.yml | 6 +++---
package.json | 11 ++++-------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8d498bc0..f21beb807 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ test:
stage: test
image: node:14.15.4-alpine
before_script:
- - RUN apk add git
+ - apk add git
script:
- yarn
- yarn test --ci --reporters=default --reporters=jest-junit
@@ -36,7 +36,7 @@ build:
stage: build
image: node:14.15.4-alpine
before_script:
- - RUN apk add git
+ - apk add git
script:
- yarn
- yarn build
@@ -59,7 +59,7 @@ publish:
stage: publish
image: node:14.15.4-alpine
before_script:
- - RUN apk add git
+ - apk add git
script:
- yarn cozyPublish
only:
diff --git a/package.json b/package.json
index a976d3462..b87f07b01 100644
--- a/package.json
+++ b/package.json
@@ -47,11 +47,15 @@
"@types/classnames": "^2.2.10",
"@types/d3": "^5.7.2",
"@types/enzyme": "^3.10.8",
+ "@types/history": "^4.7.5",
+ "@types/jest": "^24.0.25",
"@types/lodash": "^4.14.149",
"@types/luxon": "^1.21.0",
"@types/node-fetch": "^2.5.7",
+ "@types/object-hash": "^1.3.1",
"@types/react": "^16.9.15",
"@types/react-dom": "^16.9.8",
+ "@types/react-lottie": "^1.2.3",
"@types/react-redux": "^7.1.11",
"@types/react-router-dom": "^5.1.3",
"@types/redux-mock-store": "^1.0.2",
@@ -87,15 +91,8 @@
"dependencies": {
"@babel/plugin-transform-modules-commonjs": "^7.7.5",
"@babel/plugin-transform-runtime": "^7.8.3",
- "@fortawesome/fontawesome-svg-core": "^1.2.26",
- "@fortawesome/free-solid-svg-icons": "^5.12.0",
- "@fortawesome/react-fontawesome": "^0.1.8",
"@material-ui/core": "~4.8.3",
"@material-ui/styles": "^4.11.3",
- "@types/history": "^4.7.5",
- "@types/jest": "^24.0.25",
- "@types/object-hash": "^1.3.1",
- "@types/react-lottie": "^1.2.3",
"axios": "^0.19.0",
"cozy-bar": "^7.7.10",
"cozy-client": "13.18.0",
--
GitLab