From 017ecf2625c4a1fcacb18e3dd96ddbd88f2a09c2 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Tue, 12 Apr 2022 09:17:50 +0200
Subject: [PATCH 1/2] fix: build crash with error 500
Refs #527
---
.gitlab-ci.yml | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76965e220..c359794a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ stages:
- jalhyd
- install
- test
- - build
- clean-stale-branches
- deploy
- deploy-stable
@@ -70,20 +69,6 @@ test:
script:
- npm run e2e
-build:
- stage: build
- only:
- - pushes
- - tags
- - schedules
- - web
- artifacts:
- expire_in: 10 min
- paths:
- - dist/
- script:
- - npm run build -- --base-href=/cassiopee/$CI_COMMIT_REF_NAME/
-
clean-stale-branches:
stage: clean-stale-branches
only:
@@ -99,9 +84,8 @@ deploy:
- pushes
- tags
- web
- dependencies:
- - build
script:
+ - npm run build -- --base-href=/cassiopee/$CI_COMMIT_REF_NAME/
# Copie de la branche / du tag
- rsync --delete -a "dist/" "$DEPLOY_HOST_LOGIN:$DEPLOY_URL/$CI_COMMIT_REF_NAME"
@@ -110,9 +94,8 @@ deploy-stable:
only:
variables:
- $CI_COMMIT_REF_NAME == "stable"
- dependencies:
- - build
script:
+ - npm run build -- --base-href=/cassiopee/$CI_COMMIT_REF_NAME/
# Copie de la branche production
- rsync --delete -a "dist/" "$DEPLOY_HOST_LOGIN:$DEPLOY_STABLE_URL/"
# Modification du dossier base href
--
GitLab
From c71196740abe00b89a4fe9a7c1b1c10f384c6efd Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Tue, 12 Apr 2022 10:02:28 +0200
Subject: [PATCH 2/2] fix(ci): cache issue on CI
Fix #526
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c359794a1..769d645ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,7 @@ before_script:
cache:
paths:
- node_modules/
+ key: "${CI_BUILD_REF_NAME}"
jalhyd:
stage: jalhyd
--
GitLab