[MERGE] develop and fix conflics

AntaresSimulatorTeam · Jan 19, 2024 · 5256328 · 5256328
2 parents 9e5bc22 + b774fdc
commit 5256328
Show file tree

Hide file tree

Showing 85 changed files with 565 additions and 1,464 deletions.
diff --git a/.github/workflows/build-userguide.yml b/.github/workflows/build-userguide.yml
@@ -7,27 +7,29 @@ on:
     branches:
       - release/*
       - doc/*
+  workflow_call:
+    inputs:
+      run-tests:
+        required: true
+        type: boolean
 
 env:
-  IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }}
+  IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
 
 jobs:
 
   build:
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-20.04
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
 
     steps:
     - uses: actions/checkout@v3
 
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: 3.12
 
     - name: Install dependencies
       run: |
@@ -55,10 +57,12 @@ jobs:
         name: pdf-reference-guide
         path: ${{ env.PDF_PATH }}
 
-    - name: Upload user guide as release asset
+
+    - name: Publish assets
       if: ${{ env.IS_RELEASE == 'true' }}
-      uses: alexellis/[email protected]
       env:
-          GITHUB_TOKEN: ${{ github.token }}
-      with:
-          asset_paths: ${{ env.PDF_PATH_ASSET }}
+        GITHUB_TOKEN: ${{ github.token }}
+        tag: ${{ github.event.inputs.release_tag }}
+      run: |
+        gh release upload "$tag" ${{ env.PDF_PATH }}      
+
diff --git a/.github/workflows/centos7-system-deps-build.yml b/.github/workflows/centos7-system-deps-build.yml
@@ -50,7 +50,7 @@ jobs:
            source /opt/rh/devtoolset-9/enable
            #git 2.x must be enabled for Coin compilation with CMake ExternalProject_Add
            source /opt/rh/rh-git227/enable
-           cmake -B _build -S src -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON
+           cmake -B _build -S src -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON
 
     - name: Build
       run: |

diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml
@@ -8,10 +8,15 @@ on:
       - develop
   schedule:
     - cron: '21 2 * * *'
+  workflow_call:
+    inputs:
+      run-tests:
+        required: true
+        type: boolean
 
 env:
   GITHUB_TOKEN: ${{ github.token }}
-  IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }}
+  IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
   IS_PUSH: ${{ github.event_name == 'push' }}
 
 jobs:
@@ -59,14 +64,22 @@ jobs:
         yum install -y centos-release-scl
         yum install -y devtoolset-10-gcc*
 
+    - name: Install gh if needed
+      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: Configure
       run: |
            source /opt/rh/devtoolset-10/enable
            cmake3 -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 \
+           -DCMAKE_BUILD_TYPE=Release \
            -DBUILD_TESTING=ON \
            -DBUILD_not_system=OFF \
            -DBUILD_TOOLS=OFF \
@@ -110,21 +123,12 @@ jobs:
       with:
         path: _build/*.rpm
 
-  publish_assets:
-    name: Publish assets
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Download all artifacts
-      if: ${{ env.IS_RELEASE == 'true' }}
-      uses: actions/download-artifact@v3
-
-
     - name: Publish assets
       if: ${{ env.IS_RELEASE == 'true' }}
-      uses: alexellis/[email protected]
       env:
-          GITHUB_TOKEN: ${{ github.token }}
-      with:
-          asset_paths: '["*/*.tar.gz", "*/*.rpm"]'
+        GITHUB_TOKEN: ${{ github.token }}
+        tag: ${{ github.event.inputs.release_tag }}
+      run: |
+        gh release upload "$tag" _build/*.tar.gz _build/*.rpm
+
+  
diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml
@@ -13,26 +13,55 @@ on:
         description: "Run all tests (true/false)"
         required: true
 jobs:
-    release:
-      runs-on: ubuntu-20.04
-      outputs:
-        url: ${{ steps.create_release.outputs.upload_url }}
-      steps:
-        - name: Release creation
-          uses: actions/create-release@v1
-          id: create_release
-          env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          with:
-            tag_name: ${{ github.event.inputs.release_tag }}
-            release_name: ${{ github.event.inputs.release_name }}
-            body: |
-              Please complete description
-
-
-    ubuntu:
-      name: Release - Ubuntu
-      needs: release
-      uses: ./.github/workflows/ubuntu.yml
-      with:
-        run-tests: ${{ fromJSON(inputs.run-tests) }}
+      release:
+        name: Release pushed tag
+        runs-on: ubuntu-20.04
+        steps:
+          - name: Create release
+            env:
+              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              tag: ${{ github.event.inputs.release_tag }}
+              title: ${{ github.event.inputs.release_name }}
+              tests: ${{ github.event.inputs.run-tests }}
+            run: |
+              gh release create "$tag" \
+                  --repo="$GITHUB_REPOSITORY" \
+                  --title="$title" \
+                  --notes="Run tests: $tests"
+
+
+
+      ubuntu:
+        name: Release - Ubuntu
+        needs: release
+        uses: ./.github/workflows/ubuntu.yml
+        with:
+          run-tests: ${{ fromJSON(inputs.run-tests) }}
+
+      windows:
+        name: Release - Windows
+        needs: release
+        uses: ./.github/workflows/windows-vcpkg.yml
+        with:
+          run-tests: ${{ fromJSON(inputs.run-tests) }}
+
+      centos7:
+        name: Release - centos7
+        needs: release
+        uses: ./.github/workflows/centos7.yml
+        with:
+          run-tests: ${{ fromJSON(inputs.run-tests) }}
+
+      oracle8:
+        name: Release - oracle8
+        needs: release
+        uses: ./.github/workflows/oracle8.yml
+        with:
+          run-tests: ${{ fromJSON(inputs.run-tests) }}
+
+      user_guide:
+        name: User Guide
+        needs: release
+        uses: ./.github/workflows/build-userguide.yml
+        with:
+          run-tests: ${{ fromJSON(inputs.run-tests) }}
diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml
@@ -8,10 +8,15 @@ on:
       - develop
   schedule:
     - cron: '21 2 * * *'
+  workflow_call:
+    inputs:
+      run-tests:
+        required: true
+        type: boolean
 
 env:
   GITHUB_TOKEN: ${{ github.token }}
-  IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }}
+  IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
   IS_PUSH: ${{ github.event_name == 'push' }}
 
 jobs:
@@ -33,7 +38,7 @@ jobs:
 
     - name: Install libraries
       run: |
-           dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core
+           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
 
     - name: Checkout
@@ -49,11 +54,18 @@ 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
            cmake -B _build -S src \
-             -DCMAKE_BUILD_TYPE=release \
+             -DCMAKE_BUILD_TYPE=Release \
              -DBUILD_TESTING=ON \
              -DBUILD_TOOLS=OFF \
              -DBUILD_UI=OFF \
@@ -99,21 +111,11 @@ jobs:
       with:
         path: _build/*.rpm
 
-  publish_assets:
-    name: Publish assets
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Download all artifacts
-      if: ${{ env.IS_RELEASE == 'true' }}
-      uses: actions/download-artifact@v3
-
-
     - name: Publish assets
       if: ${{ env.IS_RELEASE == 'true' }}
-      uses: alexellis/[email protected]
       env:
-          GITHUB_TOKEN: ${{ github.token }}
-      with:
-          asset_paths: '["*/*.tar.gz", "*/*.rpm"]'
+        GITHUB_TOKEN: ${{ github.token }}
+        tag: ${{ github.event.inputs.release_tag }}
+      run: |
+        gh release upload "$tag" _build/*.tar.gz _build/*.rpm      
+
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -88,7 +88,7 @@ jobs:
           -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \
           -DDEPS_INSTALL_DIR=./rte-antares-deps-Debug \
           -DCODE_COVERAGE=ON \
-          -DCMAKE_BUILD_TYPE=debug \
+          -DCMAKE_BUILD_TYPE=Debug \
           -DCMAKE_PREFIX_PATH="../install;${{ env.ORTOOLS_DIR }}/install" \
           -DBUILD_TESTING=ON \
           -DMZ_CODE_COVERAGE=ON \

diff --git a/.github/workflows/ubuntu-system-deps-build.yml b/.github/workflows/ubuntu-system-deps-build.yml
@@ -43,7 +43,7 @@ jobs:
 
     - name: Configure
       run: |
-           cmake -B _build -S src -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=/usr/bin/gcc-10 -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON
+           cmake -B _build -S src -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=/usr/bin/gcc-10 -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON
 
     - name: Build
       run: |