Version 8.8.5 (#2110)

Co-authored-by: guilpier-code <[email protected]> Co-authored-by: Florian OMNES <[email protected]>
AntaresSimulatorTeam · May 27, 2024 · 0573c5f · 0573c5f
1 parent 432bc4b
commit 0573c5f
Show file tree

Hide file tree

Showing 32 changed files with 197 additions and 97 deletions.
diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml
@@ -12,12 +12,16 @@ on:
     inputs:
       run-tests:
         required: true
-        type: boolean
+        type: string
+      target_branch:
+        required: true
+        type: string
 
 env:
   GITHUB_TOKEN: ${{ github.token }}
   IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
   IS_PUSH: ${{ github.event_name == 'push' }}
+  REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}}
 
 jobs:
 
@@ -33,7 +37,14 @@ jobs:
 
     - name: Checkout
       run: |
-          git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b $GITHUB_REF_NAME .
+          git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} .
+
+    - name: Install gcc 10
+      run: |
+        yum install -y centos-release-scl
+        yum install -y devtoolset-10-gcc*
+
+    - uses: ./.github/workflows/install-cmake-328
 
     - name: Init submodule
       run: |
@@ -59,41 +70,45 @@ jobs:
             unzip -q ortools.zip
             rm ortools.zip
 
-    - name: Install gcc 10
+    - name: Install gh if needed
+      if: ${{ env.IS_RELEASE == 'true' }}
       run: |
-        yum install -y centos-release-scl
-        yum install -y devtoolset-10-gcc*
+           yum -y install dnf
+           dnf -y install 'dnf-command(config-manager)'
+           dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
+           dnf -y install gh
+
 
     - name: Configure
       run: |
            source /opt/rh/devtoolset-10/enable
-           cmake3 -B _build -S src \
+           cmake -B _build -S src \
            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
            -DDEPS_INSTALL_DIR=/rte-antares-deps-Release \
            -DCMAKE_BUILD_TYPE=Release \
            -DBUILD_TESTING=ON \
            -DBUILD_not_system=OFF \
-           -DBUILD_TOOLS=OFF \
+           -DBUILD_TOOLS=ON \
            -DBUILD_UI=OFF \
            -DCMAKE_PREFIX_PATH=${{ env.ORTOOLSDIR }}/install \
 
     - name: Build
       run: |
            source /opt/rh/devtoolset-10/enable
            source /opt/rh/rh-git227/enable
-           cmake3 --build _build --config Release -j$(nproc)
+           cmake --build _build --config Release -j$(nproc)
            ccache -s
 
     - name: Installer .rpm creation
       run: |
            cd _build
-           cpack3 -G RPM
+           cpack -G RPM
 
     - name: Solver archive creation
       run: |
            cd _build
-           cmake3 --install . --prefix install
+           cmake --install . --prefix install
            pushd .
            cd install/bin
            tar czf ../../antares-solver_centos7.tar.gz antares-*-solver libsirius_solver.so
@@ -103,7 +118,7 @@ jobs:
     - name: .tar.gz creation
       run: |
            cd _build
-           cpack3 -G TGZ
+           cpack -G TGZ
 
     - name: Installer TGZ push
       uses: actions/upload-artifact@v3
@@ -115,14 +130,6 @@ jobs:
       with:
         path: _build/*.rpm
 
-    - name: Install gh
-      if: ${{ env.IS_RELEASE == 'true' }}
-      run: |
-           yum -y install dnf
-           dnf -y install 'dnf-command(config-manager)'
-           dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
-           dnf -y install gh
-
     - name: Publish assets
       if: ${{ env.IS_RELEASE == 'true' }}
       env:
@@ -131,4 +138,4 @@ jobs:
       run: |
         gh release upload "$tag" _build/*.tar.gz _build/*.rpm
 
-  
+  
diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml
@@ -3,6 +3,9 @@ name: Create new release
 on:
   workflow_dispatch:
     inputs:
+      target_branch:
+        description: "Target branch or full commit SHA"
+        required: true
       release_tag:
         description: "Release tag"
         required: true
@@ -12,6 +15,11 @@ on:
       run-tests:
         description: "Run all tests (true/false)"
         required: true
+        type: string
+      set_latest:
+        description: "Set the release as latest"
+        required: true
+        type: boolean
 jobs:
       release:
         name: Release pushed tag
@@ -23,45 +31,52 @@ jobs:
               tag: ${{ github.event.inputs.release_tag }}
               title: ${{ github.event.inputs.release_name }}
               tests: ${{ github.event.inputs.run-tests }}
+              target_branch: ${{ github.event.inputs.target_branch }}
+              latest: ${{ github.event.inputs.set_latest }}
             run: |
               gh release create "$tag" \
                   --repo="$GITHUB_REPOSITORY" \
                   --title="$title" \
-                  --notes="Run tests: $tests"
-
+                  --notes="Run tests: $tests"\
+                  --target="$target_branch" \
+                  --latest=$latest
 
 
       ubuntu:
         name: Release - Ubuntu
         needs: release
         uses: ./.github/workflows/ubuntu.yml
         with:
-          run-tests: ${{ fromJSON(inputs.run-tests) }}
+          run-tests: ${{ inputs.run-tests }}
+          target_branch: ${{ inputs.target_branch }}
 
       windows:
         name: Release - Windows
         needs: release
         uses: ./.github/workflows/windows-vcpkg.yml
         with:
-          run-tests: ${{ fromJSON(inputs.run-tests) }}
+          run-tests: ${{ inputs.run-tests }}
+          target_branch: ${{ inputs.target_branch }}
 
       centos7:
         name: Release - centos7
         needs: release
         uses: ./.github/workflows/centos7.yml
         with:
-          run-tests: ${{ fromJSON(inputs.run-tests) }}
+          run-tests: ${{ inputs.run-tests }}
+          target_branch: ${{ inputs.target_branch }}
 
       oracle8:
         name: Release - oracle8
         needs: release
         uses: ./.github/workflows/oracle8.yml
         with:
-          run-tests: ${{ fromJSON(inputs.run-tests) }}
+          run-tests: ${{ inputs.run-tests }}
+          target_branch: ${{ inputs.target_branch }}
 
       user_guide:
         name: User Guide
         needs: release
         uses: ./.github/workflows/build-userguide.yml
         with:
-          run-tests: ${{ fromJSON(inputs.run-tests) }}
+          run-tests: ${{ inputs.run-tests }}
diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml
@@ -6,25 +6,32 @@ on:
   push:
     branches:
       - develop
+      - dependabot/*
+
   schedule:
     - cron: '21 2 * * *'
   workflow_call:
     inputs:
       run-tests:
         required: true
-        type: boolean
+        type: string
+      target_branch:
+        required: true
+        type: string
 
 env:
   GITHUB_TOKEN: ${{ github.token }}
   IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
   IS_PUSH: ${{ github.event_name == 'push' }}
+  REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}}
+
 
 jobs:
 
   build:
     name: Build
     env:
-      ORTOOLSDIR: ${{ github.workspace }}/or-tools
+      ORTOOLS_DIR: ${{ github.workspace }}/or-tools
 
     runs-on: ubuntu-latest
     container: 'oraclelinux:8'
@@ -38,12 +45,24 @@ jobs:
 
     - name: Install libraries
       run: |
-           dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core 
-           dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-10-toolchain zlib-devel
+           dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core
+           dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-11 zlib-devel
 
     - name: Checkout
       run: |
-           git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b $GITHUB_REF_NAME .
+           git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${{ env.REF }} .
+
+    - name: Config OR-Tools URL
+      run: |
+          echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_oraclelinux-8_static_sirius.zip" >> $GITHUB_ENV
+
+    - name: Download & extract OR-Tools
+      run: |
+           mkdir -p  ${{env.ORTOOLS_DIR}}
+           cd ${{env.ORTOOLS_DIR}}
+           wget ${{env.ORTOOLS_URL}} -O ortools.zip
+           unzip ortools.zip
+           rm ortools.zip
 
     - name: Init submodule
       run: |
@@ -54,18 +73,26 @@ jobs:
       run: |
           pip3 install -r src/tests/examples/requirements.txt
 
+    - name: Install gh if needed
+      if: ${{ env.IS_RELEASE == 'true' }}
+      run: |
+           dnf -y install 'dnf-command(config-manager)'
+           dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
+           dnf -y install gh
+
     - name: Configure
       run: |
-           source /opt/rh/gcc-toolset-10/enable
+           source /opt/rh/gcc-toolset-11/enable
            cmake -B _build -S src \
              -DCMAKE_BUILD_TYPE=Release \
-             -DBUILD_TESTING=ON \
-             -DBUILD_TOOLS=OFF \
+             -DBUILD_TESTING=OFF \
+             -DBUILD_TOOLS=ON \
              -DBUILD_UI=OFF \
+             -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install
 
     - name: Build
       run: |
-           source /opt/rh/gcc-toolset-10/enable
+           source /opt/rh/gcc-toolset-11/enable
            cmake --build _build --config Release -j$(nproc)
 
     - name: Run unit and end-to-end tests
@@ -104,18 +131,10 @@ jobs:
       with:
         path: _build/*.rpm
 
-    - name: Install gh
-      if: ${{ env.IS_RELEASE == 'true' }}
-      run: |
-           dnf -y install 'dnf-command(config-manager)'
-           dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
-           dnf -y install gh
-
     - name: Publish assets
       if: ${{ env.IS_RELEASE == 'true' }}
       env:
         GITHUB_TOKEN: ${{ github.token }}
         tag: ${{ github.event.inputs.release_tag }}
       run: |
-        gh release upload "$tag" _build/*.tar.gz _build/*.rpm      
-
+        gh release upload "$tag" _build/*.tar.gz _build/*.rpm