From c645eaae3341b5813567ac4589cb3e00fac42e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Fri, 22 Apr 2022 09:06:17 +0200
Subject: [PATCH] fix(ci): use linked jalhyd branch to name CI cache
refs #526
---
.gitlab-ci.yml | 5 ++---
scripts/get_jalhyd_branch_name.sh | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
create mode 100755 scripts/get_jalhyd_branch_name.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76965e220..f900ee7a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ variables:
DEPLOY_URL: "/var/www/html/cassiopee"
DEPLOY_STABLE_URL: "/var/www/cassiopee-production"
RELEASES_URL: "$DEPLOY_STABLE_URL/cassiopee-releases"
+ JALHYD_BRANCH: "$(scripts/get_jalhyd_branch_name.sh $CI_COMMIT_REF_NAME)"
before_script:
# load private key from GitLab CI variable, to deploy on Aubes server
@@ -26,6 +27,7 @@ before_script:
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
cache:
+ key: $JALHYD_BRANCH
paths:
- node_modules/
@@ -37,10 +39,7 @@ jalhyd:
- schedules
- web
script:
- - JALHYD_BRANCH=`cat jalhyd_branch`
- echo "CI_COMMIT_REF_NAME - $CI_COMMIT_REF_NAME"
- - if [ "$CI_COMMIT_REF_NAME" = "master" ]; then JALHYD_BRANCH="master"; fi
- - if [ "$CI_COMMIT_REF_NAME" = "devel" ]; then JALHYD_BRANCH="devel"; fi
- echo "Branche JalHyd - $JALHYD_BRANCH"
- cd ..
- rm -rf jalhyd
diff --git a/scripts/get_jalhyd_branch_name.sh b/scripts/get_jalhyd_branch_name.sh
new file mode 100755
index 000000000..93dba3d59
--- /dev/null
+++ b/scripts/get_jalhyd_branch_name.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# get jalhyd branch linked to current nghyd branch.
+# input parameter : nghyd branch name
+# return jalhyd branch name
+
+if (( $# != 1 )); then
+ echo "syntax : $(basename $0) <nghyd branch name>" >&2
+ exit 1
+fi
+
+nghyd_branch=$1
+
+jalhyd_branch=`cat jalhyd_branch`
+if [[ "$nghyd_branch" = "master" ]]; then jalhyd_branch="master"; fi
+if [[ "$nghyd_branch" = "devel" ]]; then jalhyd_branch="devel"; fi
+echo $jalhyd_branch
--
GitLab