diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000000000000000000000000000000000..9a280a042ea2ab778f7ca7edc7ff88865aa15cd3 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "cSpell.words": [ + "prms" + ], + "cSpell.language": "en,fr-FR" +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b28d1333a48e8d5ac7d50bac897a53d4eaaaab48..ff8a2370d7e54db086268956cc0a1a36f7db7ddb 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 diff --git a/jalhyd_branch b/jalhyd_branch index 94a6cacfd2c5dbd31533ba594f8555bfa54d5f53..1f7391f92b6a3792204e07e99f71f643cc35e7e1 100644 --- a/jalhyd_branch +++ b/jalhyd_branch @@ -1 +1 @@ -325-courbe-de-remous-calculer-une-courbe-de-remous-de-passe-a-macro-rugosites +master diff --git a/package-lock.json b/package-lock.json index 46026774f3919e173baf774c05c5beea408dc45c..7fe3ea02e9a2c3642234c84ba0fd1028083ff16a 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": { @@ -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", diff --git a/package.json b/package.json index a0c30903651968d0ad88c3289b8cc48a1b84c8f4..16813e315e9699cb4a02734b08933b0d2a6654bb 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", diff --git a/scripts/deploy-new-stable-version.sh b/scripts/deploy-new-stable-version.sh index 18a5f53fa838f07309e5bb9b776f44906fae25e5..acd2b31660b710028a90890d466c31aa882c6c9a 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."