Release/8.1.2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,7 @@ name: Bug report
 about: Create a report to help us improve
 title: ''
 labels: bug
-assignees: flomnes, guilpier-code, jmkerloch, sgatto
+assignees: flomnes, guilpier-code, sgatto
 
 ---
 

.github/workflows/branchNameValidation.yml

@@ -12,5 +12,5 @@ jobs:
     - uses: deepakputhraya/action-branch-name@master
       with:
         regex: '([a-z])+\/([a-z])+' # Regex the branch should match. This example enforces grouping
-        allowed_prefixes: 'feature,features,fix,release' # All branches should start with the given prefix
-        ignore: master,develop # Ignore exactly matching branch names from convention
+        allowed_prefixes: 'feature,features,fix,release,doc' # All branches should start with the given prefix
+        ignore: master,develop,doc # Ignore exactly matching branch names from convention

.github/workflows/build-userguide.yml

@@ -0,0 +1,46 @@
+name: Build Userguide pdf
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+      - doc
+jobs:
+
+  build:
+
+    runs-on: ${{ matrix.os }}
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install dependencies
+      run: |
+          python -m pip install --upgrade pip
+          pip3 install -r requirements-doc.txt
+
+    - name: Install libraries
+      run: |
+           sudo apt-get update --fix-missing
+           sudo apt-get install latexmk texlive-latex-recommended texlive-formats-extra
+
+    - id: create-user-guide
+      name: user guide pdf creation
+      uses: ./.github/workflows/generate-userguide-pdf
+
+    - name: user guide upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ steps.create-user-guide.outputs.pdf-name }}
+        path: ${{ steps.create-user-guide.outputs.pdf-path }}
+

.github/workflows/releases-centos7.yml → .github/workflows/centos7-release.yml

@@ -1,4 +1,4 @@
-name: Release asset upload (Centos7)
+name: Centos7 CI (Release)
 
 on:
   release:
@@ -9,23 +9,44 @@ env:
 
 jobs:
 
-  windows:
+  docker_publish:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master 
+
+    - name: Read antares-deps version
+      id: antares-deps-version
+      uses: notiz-dev/github-action-json-property@release
+      with: 
+        path: 'antares-deps-version.json'
+        prop_path: 'antares_deps_version'
+
+    - name: Get branch name
+      id: branch_name
+      uses: tj-actions/branch-names@v5
+
+    - name: Docker file push
+      uses: elgohr/Publish-Docker-Github-Action@master
+      env:
+        ANTARES_DEPS_VERSION: ${{steps.antares-deps-version.outputs.prop}}
+      with:
+        name: antaresrte/rte-antares
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        workdir: docker
+        dockerfile: centos7-basic-requirements
+        cache: true
+        tags: centos7-simulator
+        buildargs: ANTARES_DEPS_VERSION
+
+  build:
 
     runs-on: ubuntu-latest
-    container: 'centos:7'
+    needs: docker_publish
+    container: 'antaresrte/rte-antares:centos7-simulator'
 
     steps:
-
-    - name: Set up Python
-      run: |
-           yum update -y
-           yum install -y python3 python3-pip
-
-    - name: Install mandatory system libraries
-      run: |
-           yum install -y wget git epel-release redhat-lsb-core gcc gcc-c++ make centos-release-scl scl-utils
-           yum install -y openssl-devel curl-devel libuuid-devel wxGTK3-devel boost-test boost-filesystem boost-regex boost-devel 
-           yum install -y cmake3 devtoolset-7 rpm-build
 
     - uses: nelonoel/[email protected]
 
@@ -35,30 +56,22 @@ jobs:
 
     - name: Get release
       id: get_release
-      uses: bruceadams/[email protected]      
-
-    - name: Download pre-compiled librairies
-      run: |
-           wget https://github.com/AntaresSimulatorTeam/antares-deps/releases/download/v1.1.0/rte-antares-deps-centos7-Release-solver.tar.gz
-           tar -xvf rte-antares-deps-centos7-Release-solver.tar.gz
-           rm -rf rte-antares-deps-centos7-Release-solver.tar.gz
+      uses: bruceadams/[email protected]
 
     - name: Init submodule
       run: |
            git submodule update --init --recursive src
-
-    - name: Install dependencies
-      run: |
-          pip3 install -r src/tests/examples/requirements.txt
-
+
     - name: Configure
       run: |
-           source /opt/rh/devtoolset-7/enable
-           cmake3 -B _build -S src -DDEPS_INSTALL_DIR=./rte-antares-deps-Release -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON
+           source /opt/rh/devtoolset-9/enable
+           source /opt/rh/rh-git227/enable
+           cmake3 -B _build -S src -DDEPS_INSTALL_DIR=/rte-antares-deps-Release -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON
 
     - name: Build
       run: |
-           source /opt/rh/devtoolset-7/enable
+           source /opt/rh/devtoolset-9/enable
+           source /opt/rh/rh-git227/enable
            cmake3 --build _build --config release -j2
 
     - name: Running unit tests

.github/workflows/centos7-BUILD_DEPS.yml → .github/workflows/centos7-system-deps-build.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - release/*
+      - develop
+
 jobs:
 
   build:
@@ -20,9 +22,11 @@ jobs:
 
     - name: Install libraries
       run: |
-           yum install -y wget git epel-release redhat-lsb-core gcc gcc-c++ make centos-release-scl scl-utils
-           yum install -y unzip libuuid-devel libidn2-devel gtk2-devel
-           yum install -y cmake3 devtoolset-7 rpm-build
+           yum install -y epel-release
+           yum install -y git redhat-lsb-core gcc gcc-c++ make wget centos-release-scl scl-utils rpm-build
+           yum install -y cmake3 devtoolset-9
+           yum install -y rh-git227-git
+           yum install -y unzip libuuid-devel wxGTK3-devel boost-test boost-devel
 
 
     - uses: nelonoel/[email protected]
@@ -31,12 +35,6 @@ jobs:
       run: |
           git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${BRANCH_NAME} .
 
-    - name: Download pre-compiled librairies
-      run: |
-           wget https://github.com/AntaresSimulatorTeam/antares-deps/releases/download/v1.1.0/rte-antares-deps-centos7-Release-all.tar.gz
-           tar -xvf rte-antares-deps-centos7-Release-all.tar.gz
-           rm -rf rte-antares-deps-centos7-Release-all.tar.gz
-
     - name: Init submodule
       run: |
            git submodule update --init --recursive src .
@@ -47,12 +45,15 @@ jobs:
 
     - name: Configure
       run: |
-           source /opt/rh/devtoolset-7/enable
-           cmake3 -B _build -S src -DDEPS_INSTALL_DIR=rte-antares-deps-Release -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON -DUSE_PRECOMPILED_EXT=ON
+           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
+           cmake3 -B _build -S src -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON -DBUILD_ortools=ON
 
     - name: Build
       run: |
-           source /opt/rh/devtoolset-7/enable
+           source /opt/rh/devtoolset-9/enable
+           source /opt/rh/rh-git227/enable
            cmake3 --build _build --config release -j2
 
     - name: Run unit tests

.github/workflows/centos7-system.yml

@@ -1,4 +1,4 @@
-name: Centos7 CI (system libs)
+name: Centos7 CI (pre-compiled)
 
 on:
   push:
@@ -10,53 +10,72 @@ on:
       - release/*
 jobs:
 
+  docker_publish:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+      with:
+        fetch-depth: 0
+
+    - name: Get changed files
+      id: changed-files
+      uses: tj-actions/[email protected]
+      with:
+        files: |
+          docker/centos7-basic-requirements
+          antares-deps-version.json
+
+    - name: Read antares-deps version
+      id: antares-deps-version
+      if: steps.changed-files.outputs.modified_files != ''
+      uses: notiz-dev/github-action-json-property@release
+      with: 
+        path: 'antares-deps-version.json'
+        prop_path: 'antares_deps_version'
+
+    - name: Docker file push
+      id: docker_push
+      if: steps.changed-files.outputs.modified_files != ''
+      uses: elgohr/Publish-Docker-Github-Action@master
+      env:
+        ANTARES_DEPS_VERSION: ${{steps.antares-deps-version.outputs.prop}}
+      with:
+        name: antaresrte/rte-antares
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        workdir: docker
+        dockerfile: centos7-basic-requirements
+        cache: true
+        tags: centos7-simulator
+        buildargs: ANTARES_DEPS_VERSION
+
   build:
 
     runs-on: ubuntu-latest
-    container: 'centos:7'
+    needs: docker_publish
+    container: 'antaresrte/rte-antares:centos7-simulator'
 
     steps:
 
-    - name: Set up Python
-      run: |
-           yum update -y
-           yum install -y python3 python3-pip
-
-    - name: Install libraries
-      run: |
-           yum install -y wget git epel-release redhat-lsb-core gcc gcc-c++ make centos-release-scl scl-utils
-           yum install -y unzip openssl-devel curl-devel libuuid-devel wxGTK3-devel boost-test boost-filesystem boost-regex boost-devel 
-           yum install -y cmake3 devtoolset-7 rpm-build
-
-
     - uses: nelonoel/[email protected]
 
     - name: Checkout
       run: |
           git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b ${BRANCH_NAME} .
 
-    - name: Download pre-compiled librairies
-      run: |
-           wget https://github.com/AntaresSimulatorTeam/antares-deps/releases/download/v1.1.0/rte-antares-deps-centos7-Release-solver.tar.gz
-           tar -xvf rte-antares-deps-centos7-Release-solver.tar.gz
-           rm -rf rte-antares-deps-centos7-Release-solver.tar.gz
-
     - name: Init submodule
       run: |
            git submodule update --init --recursive src .
-
-    - name: Install dependencies
-      run: |
-          pip3 install -r src/tests/examples/requirements.txt
 
     - name: Configure
       run: |
-           source /opt/rh/devtoolset-7/enable
-           cmake3 -B _build -S src -DDEPS_INSTALL_DIR=rte-antares-deps-Release -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON -DBUILD_OUTPUT_TEST=ON
+           source /opt/rh/devtoolset-9/enable
+           cmake3 -B _build -S src -DDEPS_INSTALL_DIR=/rte-antares-deps-Release -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON -DBUILD_OUTPUT_TEST=ON -DBUILD_not_system=OFF
 
     - name: Build
       run: |
-           source /opt/rh/devtoolset-7/enable
+           source /opt/rh/devtoolset-9/enable
            cmake3 --build _build --config Release -j2
 
     - name: Run unit tests

.github/workflows/download-extract-precompiled-libraries-tgz/action.yml

@@ -0,0 +1,26 @@
+name: "Download extract .tgz precompiled libraries"
+description: "Download and extract .tgz precompiled libraries from antares-deps and antares-simulator repository"
+inputs:
+  antares-deps-version:
+    description: 'antares-deps version'
+    required: true
+  os:
+    description: 'operational system used for github action'
+    required: true  
+  os-full-name:
+    description: 'full operational system name used (for example Centos-7.9.2009 or Ubuntu-20.04'
+    required: true
+  buildtype:
+    description: 'build type'
+    required: false
+    default: 'Release'
+runs:
+  using: "composite"
+  steps: 
+  - id: download-extract
+    shell: bash
+    run: |
+           wget https://github.com/AntaresSimulatorTeam/antares-deps/releases/download/v${{inputs.antares-deps-version}}/rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}-solver.tar.gz
+           tar -xvf rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}-solver.tar.gz
+           rm -rf rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}-solver.tar.gz
+

.github/workflows/download-extract-precompiled-libraries-zip/action.yml

@@ -0,0 +1,28 @@
+name: "Download extract .zip precompiled libraries"
+description: "Download and extract .zip precompiled libraries from antares-deps and antares-simulator repository"
+inputs:
+  antares-deps-version:
+    description: 'antares-deps version'
+    required: true 
+  os:
+    description: 'operational system used for github action'
+    required: true
+  buildtype:
+    description: 'build type'
+    required: false
+    default: 'Release'
+  artifact_version:
+    description: 'artifact version defining contents (all or solver)'
+    required: false
+    default: 'solver'
+
+runs:
+  using: "composite"
+  steps: 
+  - id: download-extract
+    shell: bash
+    run: |
+           wget https://github.com/AntaresSimulatorTeam/antares-deps/releases/download/v${{inputs.antares-deps-version}}/rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}-${{inputs.artifact_version}}.zip
+           unzip rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}-${{inputs.artifact_version}}.zip
+           rm -rf rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}-${{inputs.artifact_version}}.zip
+