From 8bdd85e498c49ed8bd6b574639a14a98cb9f7f7b Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Fri, 1 Jul 2022 14:09:00 +0000
Subject: [PATCH] fix(ci): fall back on jalhyd devel branch instead of master
if the requested jalhyd branch does not exists
This allows to run CI jobs on a nghyd developpement branch when the corresponding jalhyd branch has already been merged into devel.
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 901ed8f2a..aaf15f2ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,7 @@ jalhyd:
- rm -rf jalhyd
- git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.irstea.fr/cassiopee/jalhyd.git
- cd jalhyd
- - git checkout "$JALHYD_BRANCH" || git checkout master
+ - git checkout "$JALHYD_BRANCH" || git checkout devel
- npm ci --force
- npm run build
--
GitLab