From 50555175e744f48507a58bdebcb06a6a5c183020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20Mar=C3=A9chal?= <45510813+JasonMarechal25@users.noreply.github.com> Date: Tue, 27 Feb 2024 13:22:13 +0100 Subject: [PATCH] Release 1.2.2 (#759) --- .github/workflows/build_oracle8.yml | 3 ++- .github/workflows/centos-release.yml | 4 ++-- .github/workflows/compile-gtest/action.yml | 2 +- .github/workflows/ol8-release.yml | 6 ++++-- .github/workflows/windows-vcpkg.yml | 4 ++-- CMakeLists.txt | 2 +- antares-version.json | 4 ++-- cmake/dependencies/CMakeLists.txt | 6 +++--- docs/changelog/CHANGELOG.md | 5 +++++ sonar-project.properties | 2 +- 10 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_oracle8.yml b/.github/workflows/build_oracle8.yml index 364036392..1bec05abb 100644 --- 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 index d57352c9d..a89a3e87f 100644 --- 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 index ac77c96c5..9218e3fb6 100644 --- 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 index 45f68d153..2ca782880 100644 --- 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 index abbebbf60..158699079 100644 --- 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 index 8f60685df..5fb9091e3 100644 --- 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 index ce581d557..fc47f8774 100644 --- 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 index 1f0fa403a..3f1b24972 100644 --- 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 index 0fae13ef0..80a041b6c 100644 --- 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 index cea0584f4..1481123a3 100644 --- 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