refactor: move jalhyd as a subdirectory of nghyd

refs #558

.gitignore

@@ -62,3 +62,6 @@ install_jalhyd
 # Cordova
 platforms/**
 plugins/**
+
+# Jalhyd directory (so far, to be removed if we make jalhyd a Git submodule)
+/jalhyd

.gitlab-ci.yml

 stages:
-  - jalhyd
   - install
   - test
   - build
@@ -10,7 +9,8 @@ stages:
   - releases-version
 
 default:
-  tags: [cassiopee]
+  tags: [docker]
+  image: geaucassiopee/ci-cd-cross-platform-webapp:v2
 
 variables:
 # from Gitlab CI/CD environment variables :
@@ -45,9 +45,10 @@ cache:
       - package.json
   paths:
     - node_modules/
+    - jalhyd/
 
-jalhyd:
-  stage: jalhyd
+install:
+  stage: install
   only:
     - pushes
     - tags
@@ -59,24 +60,14 @@ jalhyd:
     - 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
     - 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
-
-install:
-  stage: install
-  only:
-    - pushes
-    - tags
-    - schedules
-    - web
-  script:
+    - cd ..
     - rm -rf node_modules
-# force electron_config_cache environment variable to solve Election installation error
     - npm ci --force --unsafe-perm
 
 test:
@@ -122,8 +113,7 @@ deploy-dev:
     - build
   script:
     # Copie de la branche / du tag
-    - if [[ $CI_COMMIT_REF_NAME != "stable" ]]; then ./scripts/deploy-version.sh $CI_COMMIT_REF_NAME $DEV_LOGIN $DEV_HOST $DEV_PATH; fi
-    - if [[ $CI_COMMIT_REF_NAME == "stable" ]]; then ./scripts/deploy-version.sh $CI_COMMIT_REF_NAME $DEV_LOGIN $DEV_HOST $DEV_PATH/stable 0; fi
+    - ./scripts/deploy-version.sh $CI_COMMIT_REF_NAME $DEV_LOGIN $DEV_HOST $DEV_PATH
 
 deploy-prod:
   stage: deploy-prod
@@ -133,7 +123,7 @@ deploy-prod:
   dependencies:
     - build
   script:
-    - ./scripts/deploy-version.sh stable $PROD_LOGIN $PROD_HOST $PROD_PATH 1 $PROD_PASS
+    - ./scripts/deploy-version.sh prod $PROD_LOGIN $PROD_HOST $PROD_PATH $PROD_PASS
 
 releases-nightly:
   stage: releases-nightly

package.json

@@ -3,7 +3,7 @@
   "displayName": "Cassiopée",
   "description": "Hydraulic calculators",
   "author": "Inrae",
-  "version": "4.15.0",
+  "version": "4.15.1",
   "main": "main.js",
   "homepage": "https://cassiopee.g-eau.fr",
   "license": "MIT",
@@ -66,7 +66,7 @@
     "core-js": "^3.23.3",
     "file-saver": "^2.0.5",
     "he": "^1.2.0",
-    "jalhyd": "file:../jalhyd",
+    "jalhyd": "file:./jalhyd",
     "katex": "^0.16.0",
     "material-design-icons": "^3.0.1",
     "mathjax": "^3.2.2",

scripts/check-translations.js

@@ -20,7 +20,7 @@ let nbErr = 0;
 // ---- 1. JaLHyd messages ----
 
 // read and transform JaLHyd message file
-const jalhydMessagesPath = "../jalhyd/src/util/message.ts";
+const jalhydMessagesPath = "./jalhyd/src/util/message.ts";
 let jm = fs.readFileSync(jalhydMessagesPath, "utf-8");
 // extract enum block
 jm = jm.replace(/export enum MessageCode \{([^{]+)\}[\s\S]+/m, (match, p1) => {

scripts/deploy-new-stable-version.sh

@@ -31,7 +31,7 @@ fi
 # 1. JaLHyd ###################################################################
 
 echo "BUILDING JALHYD"
-cd ../jalhyd
+cd jalhyd
 
 # 1.2 update Git repository and test
 git checkout master
@@ -66,7 +66,7 @@ git push --tags --force
 # 2. NgHyd ####################################################################
 
 echo "BUILDING NGHYD"
-cd ../nghyd
+cd ..
 
 # 2.2 update Git repository
 git checkout master