diff --git a/.github/workflows/build_centos7.yml b/.github/workflows/build_centos7.yml index 3cf271ca3..32c86126b 100644 --- a/.github/workflows/build_centos7.yml +++ b/.github/workflows/build_centos7.yml @@ -6,6 +6,7 @@ on: branches: - develop - dependabot/* + - release/* pull_request: release: types: [ created ] @@ -107,14 +108,6 @@ jobs: with: cmake-version: '3.28.x' - #Lukka's action doesn't work on runner. - #jwlawson's action doesn't work in ACT - #I left this here to quicly switch between one or the other - # - uses: lukka/get-cmake@latest - # with: - # useLocalCache: false - # useCloudCache: true - - name: Checkout xpressmp linux uses: actions/checkout@v3 #keep v3 with: @@ -132,18 +125,12 @@ jobs: os: centos7 os-full-name: CentOS-7.9.2009 - - name: openmpi-devel + - name: repo update run: | yum update sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo - yum install -y openmpi-devel - - - name: Compile Boost - uses: ./.github/workflows/compile-boost - with: - prefix: "${GITHUB_WORKSPACE}/deps" - name: Install dependencies run: | @@ -175,8 +162,6 @@ jobs: - name: Configure run: | source /opt/rh/devtoolset-10/enable - export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH - export PATH=/usr/lib64/openmpi/bin:$PATH cmake -B _build -S . \ -DBUILD_TESTING=ON \ -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/deps \ @@ -202,8 +187,8 @@ jobs: timeout-minutes: 120 shell: bash run: | - export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH - export PATH=/usr/lib64/openmpi/bin:${{ env.XPRS_LIB_Path_CONTAINER }}:$PATH + export PATH=${GITHUB_WORKSPACE}/_build/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH + export LD_LIBRARY_PATH=LD_LIBRARY_PATH:${{ env.XPRS_LIB_Path_CONTAINER }} export XPRESS=${{ env.XPRESS_CONTAINER }} cd _build ctest -C Release --output-on-failure -L "unit|benders|lpnamer|medium" diff --git a/.github/workflows/build_oracle8.yml b/.github/workflows/build_oracle8.yml index eebc42ceb..ab5eba027 100644 --- a/.github/workflows/build_oracle8.yml +++ b/.github/workflows/build_oracle8.yml @@ -6,6 +6,7 @@ on: branches: - develop - dependabot/* + - release/* pull_request: release: types: [ created ] @@ -62,12 +63,11 @@ jobs: steps: - name: Install System run: | - dnf install -y epel-release git wget rpm-build redhat-lsb-core openmpi-devel + dnf install -y epel-release git wget rpm-build redhat-lsb-core dnf install -y unzip libuuid-devel gcc-toolset-10-toolchain python3-devel zlib-devel #make gcc &co available system wide and "action wide" source /opt/rh/gcc-toolset-10/enable echo $PATH >> $GITHUB_PATH - - run: | dnf module install -y nodejs:20/common @@ -80,11 +80,6 @@ jobs: - uses: actions/checkout@v4 with: submodules: true - - - name: Compile Boost - uses: ./.github/workflows/compile-boost - with: - prefix: "${GITHUB_WORKSPACE}/deps" - name: Checkout xpressmp linux uses: actions/checkout@v4 @@ -132,8 +127,6 @@ jobs: - name: Configure run: | - export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH - export PATH=/usr/lib64/openmpi/bin:$PATH cmake -B _build -S . \ -DBUILD_TESTING=ON \ -DCMAKE_BUILD_TYPE=Release \ @@ -151,8 +144,8 @@ jobs: timeout-minutes: 120 shell: bash run: | - export PATH=/usr/lib64/openmpi/bin:$PATH - export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:${{ env.XPRS_LIB_Path_CONTAINER }}:$LD_LIBRARY_PATH + export PATH=${GITHUB_WORKSPACE}/_build/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH + export LD_LIBRARY_PATH=LD_LIBRARY_PATH:${{ env.XPRS_LIB_Path_CONTAINER }} export XPRESS=${{ env.XPRESS_CONTAINER }} cd _build ctest -C Release --output-on-failure -L "unit|benders|lpnamer|medium" diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index ed28fbed6..972cc832c 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -7,6 +7,7 @@ on: - main - develop - dependabot/* + - release/* pull_request: release: types: [ created ] @@ -55,7 +56,6 @@ jobs: sudo apt-get update --fix-missing sudo apt-get install -y ccache sudo apt-get install -y g++-10 gcc-10 - sudo apt-get install -y libopenmpi-dev - name: ccache @@ -85,11 +85,6 @@ jobs: sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30 sudo update-alternatives --set c++ /usr/bin/g++ - - name: Compile Boost - uses: ./.github/workflows/compile-boost - with: - prefix: "${GITHUB_WORKSPACE}/deps" - - uses: lukka/get-cmake@latest with: useLocalCache: false @@ -153,7 +148,7 @@ jobs: - name: Test run: | - export PATH=${GITHUB_WORKSPACE}/_build/vcpkg_installed/x64-linux/tools/openmpi/bin/:$PATH + export PATH=${GITHUB_WORKSPACE}/_build/vcpkg_installed/x64-linux/tools/openmpi/bin:$PATH cd _build ctest -C Release --output-on-failure -L "medium|unit|benders|lpnamer" diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 9125419af..629c87135 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -7,6 +7,7 @@ on: - main - develop - dependabot/* + - release/* pull_request: release: types: [ created ] diff --git a/.github/workflows/compile-boost/action.yml b/.github/workflows/compile-boost/action.yml deleted file mode 100644 index c8f9bbe88..000000000 --- a/.github/workflows/compile-boost/action.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: "Download and compile boost" -description: "Download and compile boost" -inputs: - prefix: - description: 'extra qualifiers' - required: true -runs: - using: "composite" - steps: - - id: install-boost - shell: bash - run: | - source /opt/rh/gcc-toolset-10/enable || true - export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH - export PATH=/usr/lib64/openmpi/bin:$PATH - wget https://github.com/boostorg/boost/releases/download/boost-1.81.0/boost-1.81.0.tar.gz - tar xvf boost-1.81.0.tar.gz - cd boost-1.81.0 - ./bootstrap.sh --prefix=${{inputs.prefix}}/ --with-libraries=serialization,program_options,mpi - echo "using mpi ;" >> project-config.jam - ./b2 install diff --git a/.github/workflows/download-extract-precompiled-libraries-tgz/action.yml b/.github/workflows/download-extract-precompiled-libraries-tgz/action.yml index 43e23e7f8..8442deff3 100644 --- a/.github/workflows/download-extract-precompiled-libraries-tgz/action.yml +++ b/.github/workflows/download-extract-precompiled-libraries-tgz/action.yml @@ -24,8 +24,6 @@ runs: - id: download-extract shell: bash run: | - export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH - export PATH=/usr/lib64/openmpi/bin:$PATH mkdir -p deps wget https://github.com/AntaresSimulatorTeam/Antares_Simulator/releases/download/v${{inputs.antares-version}}/antares-${{inputs.antares-version}}-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz tar -xvf antares-${{inputs.antares-version}}-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz -C deps --strip-components=1 diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index c0b650361..f3b7d4d66 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -65,12 +65,7 @@ jobs: sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30 sudo update-alternatives --set cc /usr/bin/gcc sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30 - sudo update-alternatives --set c++ /usr/bin/g++ - - - name: Compile Boost - uses: ./.github/workflows/compile-boost - with: - prefix: "${GITHUB_WORKSPACE}/deps" + sudo update-alternatives --set c++ /usr/bin/g++ - name: Read antares-solver version id: antares-version diff --git a/requirements.txt b/requirements.txt index 7b019ee7f..c5ff70d62 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ wheel -pyinstaller>=4.3 +pyinstaller==4.5.1; platform_system=='Linux' #Version 6 cause issue when packaging mpi see #882 +pyinstaller>=4.5.1; platform_system=='Windows' #Issues with 4.5 on Windows. Proper condition should be on python version pyyaml dataclasses psutil==5.8.0 diff --git a/vcpkg.json b/vcpkg.json index c3aa8babb..93b39d712 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -14,18 +14,15 @@ "coin-or-cbc", { "name": "boost-mpi", - "version>=": "1.81.0", - "platform": "windows" + "version>=": "1.81.0" }, { "name": "boost-program-options", - "version>=": "1.81.0", - "platform": "windows" + "version>=": "1.81.0" }, { "name": "boost-algorithm", - "version>=": "1.81.0", - "platform": "windows" + "version>=": "1.81.0" }, "yaml-cpp", {