feat(desktop): update Antares Web Desktop version (#2036)

Changes: - update the sample study to version v8.8 - update Antares Solver to version v8.8.5 - remove `AntaresWebWorker` from distribution
AntaresSimulatorTeam · Jun 9, 2024 · 7bfdbb1 · 7bfdbb1
1 parent eaeb7ea
commit 7bfdbb1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 67 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - "master"
       - "hotfix/**"
+      - 'feature/remove-AntaresWebWorker'
 
 jobs:
   binary:
@@ -66,12 +67,12 @@ jobs:
           auto-changelog -l false --hide-empty-releases
           mv CHANGELOG.md dist/package/CHANGELOG.md
 
-      - name: 📦 Archive Antares Desktop + Worker for Windows
+      - name: 📦 Archive Antares Desktop for Windows
         if: matrix.os == 'windows-latest'
         run: 7z a AntaresWeb.zip *
         working-directory: dist/package
 
-      - name: 📦 Archive Antares Desktop + Worker for Ubuntu
+      - name: 📦 Archive Antares Desktop for Ubuntu
         # this is the only way to preserve file permission and symlinks
         if: matrix.os == 'ubuntu-20.04'
         run: zip -r --symlinks AntaresWeb.zip *

diff --git a/AntaresWebWorker.spec b/AntaresWebWorker.spec
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -9,6 +9,7 @@ v2.17.1 (2024-05-29)
 * **launcher:** add new API endpoint `/v1/launcher/time-limit` and update `LauncherDialog` [`#2012`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/2012)
 * **raw:** refactor aggregation endpoint [`#2031`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/2031)
 * **ui-utils:** add overload signatures for validateNumber function in validationUtils [`#2029`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/2029)
+* **desktop**: update Antares Web Desktop version [`#2036`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/2036)
 
 
 ### Bug Fixes

diff --git a/resources/deploy/README.md b/resources/deploy/README.md
@@ -57,16 +57,3 @@ The tool has the following subcommands:
 - `upgrade-study`:         Upgrades study version
 
 Further instructions can be found in the online help. Use the `--help' option.
-
-## Using the Archive Worker
-
-The Antares archive manager is a command that runs in the background to automatically unarchive simulation results.
-The worker is notified by the web application via EventBus to initiate asynchronous unarchiving of the results.
-
-To launch the archive worker, run the command:
-
-```
-./AntaresWebWorker -c config.yaml -w default
-```
-
-Further instructions can be found in the online help. Use the `--help' option.
diff --git a/resources/deploy/examples/studies/example_study.zip b/resources/deploy/examples/studies/example_study.zip
diff --git a/scripts/package_antares_web.sh b/scripts/package_antares_web.sh
@@ -9,7 +9,7 @@
 set -e
 
 ANTARES_SOLVER_VERSION="8.8"
-ANTARES_SOLVER_FULL_VERSION="8.8.4"
+ANTARES_SOLVER_FULL_VERSION="8.8.5"
 ANTARES_SOLVER_VERSION_INT="880"
 
 SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P)
@@ -45,11 +45,6 @@ else
   popd
 fi
 
-echo "INFO: Generating the Worker Application..."
-pushd ${PROJECT_DIR}
-pyinstaller --distpath ${DIST_DIR} AntaresWebWorker.spec
-popd
-
 echo "INFO: Creating destination directory '${ANTARES_SOLVER_DIR}'..."
 mkdir -p "${ANTARES_SOLVER_DIR}"
 
@@ -91,7 +86,7 @@ if [[ "$OSTYPE" == "msys"* ]]; then
   cp "${RESOURCES_DIR}/AntaresWebServerShortcut.lnk" "${DIST_DIR}"
 else
   echo "INFO: Updating executable permissions..."
-  for excutable in "${DIST_DIR}/AntaresWeb/AntaresWebServer" "${DIST_DIR}/AntaresWeb/AntaresTool" "${DIST_DIR}/AntaresWebWorker"; do
+  for excutable in "${DIST_DIR}/AntaresWeb/AntaresWebServer" "${DIST_DIR}/AntaresWeb/AntaresTool"; do
     chmod +x "${excutable}"
   done
 fi