From 710a549799e260507cc102a6960474b92a100499 Mon Sep 17 00:00:00 2001
From: Dorch <14124454+DDorch@users.noreply.github.com>
Date: Mon, 29 Jan 2024 17:50:54 +0000
Subject: [PATCH 1/6] docs: update CHANGELOG for v4.18.0
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b28d1333a..ff8a2370d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# Historique des versions
-### 4.18.0 - 2024-01-29
+### 4.18.0 - 2024-01-30
#### Nouvelles fonctionnalités
--
GitLab
From 5a6f2324b57107f6bcae6cecab0f6c52c0389945 Mon Sep 17 00:00:00 2001
From: Dorch <14124454+DDorch@users.noreply.github.com>
Date: Tue, 30 Jan 2024 06:12:58 +0000
Subject: [PATCH 2/6] chore: update jalhyd_branch
---
jalhyd_branch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jalhyd_branch b/jalhyd_branch
index 94a6cacfd..1f7391f92 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-325-courbe-de-remous-calculer-une-courbe-de-remous-de-passe-a-macro-rugosites
+master
--
GitLab
From f97a88a14ed4b08bc74b02c555dae5d518d432f9 Mon Sep 17 00:00:00 2001
From: Dorch <14124454+DDorch@users.noreply.github.com>
Date: Tue, 30 Jan 2024 08:09:58 +0000
Subject: [PATCH 3/6] vscode: add language settings
---
.vscode/settings.json | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 .vscode/settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..9a280a042
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+ "cSpell.words": [
+ "prms"
+ ],
+ "cSpell.language": "en,fr-FR"
+}
\ No newline at end of file
--
GitLab
From a9e58d86fea3d664b0efcf03e8af9f2bc1114fe9 Mon Sep 17 00:00:00 2001
From: Dorch <14124454+DDorch@users.noreply.github.com>
Date: Tue, 30 Jan 2024 08:11:09 +0000
Subject: [PATCH 4/6] fix(deploy): error -39 on nghyd npm install
---
scripts/deploy-new-stable-version.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/deploy-new-stable-version.sh b/scripts/deploy-new-stable-version.sh
index 18a5f53fa..acd2b3166 100755
--- a/scripts/deploy-new-stable-version.sh
+++ b/scripts/deploy-new-stable-version.sh
@@ -79,6 +79,7 @@ cd ..
# 2.1 update Git repository
git checkout master
git pull --rebase
+rm -rf jalhyd/node_modules
npm install
if [ ! -z "$(git status --untracked-files=no --porcelain)" ]
then
@@ -106,6 +107,6 @@ git push --tags --force
echo
echo "N'oubliez pas de modifier le numéro de version dans le document https://doi.org/10.15454/TLO5LX"
-echo
+echo
echo "Tagging done, Gitlab CI/CD should take care of the rest."
--
GitLab
From 0988e3ec14bd598efa7bc1b3a5ce93c55f4b8a2a Mon Sep 17 00:00:00 2001
From: Dorch <14124454+DDorch@users.noreply.github.com>
Date: Tue, 30 Jan 2024 08:19:05 +0000
Subject: [PATCH 5/6] verify dependencies (npm install) before deploying
version 4.18.0
---
package-lock.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package-lock.json b/package-lock.json
index 46026774f..d119bdf64 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -87,7 +87,7 @@
}
},
"jalhyd": {
- "version": "4.17.1",
+ "version": "4.18.0",
"license": "LGPL-3.0-or-later",
"dependencies": {
"@types/base-64": "^1.0.0",
--
GitLab
From 6d177110cdb930b7c29adf3a5ab705a81908f230 Mon Sep 17 00:00:00 2001
From: Dorch <14124454+DDorch@users.noreply.github.com>
Date: Tue, 30 Jan 2024 08:19:11 +0000
Subject: [PATCH 6/6] update package.* to version 4.18.0
---
package-lock.json | 4 ++--
package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index d119bdf64..7fe3ea02e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "fr.irstea.cassiopee",
- "version": "4.17.1",
+ "version": "4.18.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "fr.irstea.cassiopee",
- "version": "4.17.1",
+ "version": "4.18.0",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index a0c309036..16813e315 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"displayName": "Cassiopée",
"description": "Hydraulic calculators",
"author": "Inrae",
- "version": "4.17.1",
+ "version": "4.18.0",
"main": "main.js",
"homepage": "https://cassiopee.g-eau.fr",
"license": "MIT",
--
GitLab