Merge branch 'develop' into fix/xpress-licence-finder

AntaresSimulatorTeam · Feb 27, 2024 · 68e1f02 · 68e1f02
2 parents 67e00a3 + 5055517
commit 68e1f02
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 15 deletions.
diff --git a/.github/workflows/build_oracle8.yml b/.github/workflows/build_oracle8.yml
@@ -71,6 +71,8 @@ jobs:
         with:
           submodules: true
 
+      - uses: ./.github/workflows/compile-gtest
+
       - name: Checkout xpressmp linux
         uses: actions/checkout@v3
         with:
@@ -101,7 +103,6 @@ jobs:
         uses: ./.github/workflows/compile-boost
         with:
           prefix: "../rte-antares-deps-Release/"
-
       - name: Compile TBB
         uses: ./.github/workflows/compile-tbb
 

diff --git a/.github/workflows/centos-release.yml b/.github/workflows/centos-release.yml
@@ -273,13 +273,13 @@ jobs:
       - name: Download Artifact
         uses: actions/download-artifact@v3
         with:
-          name: $ZIP_NAME
+          name: ${{ env.ZIP_NAME}}
           path: .
 
       - name: Download Artifact
         uses: actions/download-artifact@v3
         with:
-          name: $SINGLEFILE_NAME
+          name: ${{env.SINGLEFILE_NAME}}
           path: .
 
       - name: Upload Release Asset

diff --git a/.github/workflows/compile-gtest/action.yml b/.github/workflows/compile-gtest/action.yml
@@ -6,7 +6,7 @@ runs:
     - id: build-gtest
       shell: bash
       run: |
-        source /opt/rh/devtoolset-10/enable
+        source /opt/rh/devtoolset-10/enable || source /opt/rh/gcc-toolset-10/enable || true
         git clone -b v1.14.0 https://github.com/google/googletest.git
         cd googletest
         cmake3 -G"Unix Makefiles"

diff --git a/.github/workflows/ol8-release.yml b/.github/workflows/ol8-release.yml
@@ -126,6 +126,8 @@ jobs:
       - name: Compile tbb
         uses: ./.github/workflows/compile-tbb
 
+      - uses: ./.github/workflows/compile-gtest
+
       - name: Install dependencies
         run: |
           pip3 install --upgrade pip
@@ -249,13 +251,13 @@ jobs:
       - name: Download Artifact
         uses: actions/download-artifact@v3
         with:
-          name: $ZIP_NAME
+          name: ${{env.ZIP_NAME}}
           path: .
 
       - name: Download Artifact
         uses: actions/download-artifact@v3
         with:
-          name: $SINGLEFILE_NAME
+          name: ${{env.SINGLEFILE_NAME}}
           path: .
 
       - name: Upload Release Asset

diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
@@ -256,13 +256,13 @@ jobs:
       - name: Download Artifact
         uses: actions/download-artifact@v3
         with:
-          name: $ZIP_NAME
+          name: ${{env.ZIP_NAME}}
           path: .
 
       - name: Download Artifact
         uses: actions/download-artifact@v3
         with:
-          name: $SINGLEFILE_NAME
+          name: ${{env.SINGLEFILE_NAME}}
           path: .
 
       - name: Upload Release Asset

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 # Project configuration
 # ===========================================================================
 
-PROJECT(antaresXpansion VERSION 1.2.0)
+PROJECT(antaresXpansion VERSION 1.2.2)
 set(ANTARES_XPANSION_RC 0)
 
 # ===========================================================================

diff --git a/antares-version.json b/antares-version.json
@@ -1,7 +1,7 @@
 {
-  "antares_version": "8.8.0",
+  "antares_version": "8.8.3",
   "antares_version_executable": "8.8",
-  "antares_xpansion_version": "1.2.0",
+  "antares_xpansion_version": "1.2.2",
   "antares_deps_version": "2.0.7",
   "minizip_ng_version": "3.0.6"
 }
diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
@@ -12,11 +12,11 @@ if (NOT antares-solver_FOUND)
     set(CMAKE_ARGS "-DBUILD_UI=OFF -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DDEPS_INSTALL_DIR=${DEPS_INSTALL_DIR} -DBUILD_not_system=OFF -DBUILD_ortools=ON ")
 
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set(ANTARES_BUILD_TYPE "debug")
+        set(ANTARES_BUILD_TYPE "Debug")
     else ()
-
-      set(ANTARES_BUILD_TYPE "release")
+        set(ANTARES_BUILD_TYPE "Release")
     endif ()
+    #Don't use CMAKE_BUILD_TYPE directly to support exotic build type in xpansion that may not exist in Simulator
 
     build_git_dependency(
         NAME

diff --git a/docs/changelog/CHANGELOG.md b/docs/changelog/CHANGELOG.md
@@ -1,6 +1,11 @@
 Antares-Xpansion changelog
 =================
 
+v1.2.2 (02/2024)
+--------------------------------------------------------
+
+- Update Antares simulator to 8.8.3
+
 v1.2 (10/2023)
 --------------------------------------------------------
 

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.projectName=antares-xpansion
 sonar.projectKey=AntaresSimulatorTeam_antares-xpansion
 sonar.organization=antaressimulatorteam
-sonar.projectVersion=1.2.0
+sonar.projectVersion=1.2.2
 
 # =====================================================
 #   Properties that will be shared amongst all modules