Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/8.6.9 #75

Open
wants to merge 30 commits into
base: New-Antares-Emulator-2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
9dbbf5e
[vcpkg] Use tag 2023.04.15
flomnes Jun 15, 2023
c6ac012
Fix cost for short-term storage variables
flomnes Jun 21, 2023
e25e1d8
Prepare v8.6.1
flomnes Jun 21, 2023
595487c
Increase load file size limit to 80Go from 80mo
JasonMarechal25 Aug 1, 2023
d252692
Handle errMemoryLimit properly
JasonMarechal25 Aug 1, 2023
dfe1414
Update version number
JasonMarechal25 Aug 1, 2023
b7c43ee
[Win] Increase file size limit when reading file
JasonMarechal25 Oct 4, 2023
eb98c5a
v8.6.3
JasonMarechal25 Oct 4, 2023
b11cd6b
[Win] Use correct type for file size limit
JasonMarechal Oct 3, 2023
a03a912
Fix output variable PROFIT for thermal clusters (#1767)
flomnes Nov 20, 2023
38efef6
Fix Oracle Linux minizip build + actually run zip unit tests (#1744)
flomnes Nov 20, 2023
c36cfc8
Version = 8.6.4
flomnes Nov 20, 2023
7fcdea7
Upload assets before running tests
flomnes Nov 21, 2023
f3e9660
Remove CMake target
flomnes Nov 21, 2023
d06b683
Bump vcpkg to @develop, try to fix build
flomnes Nov 21, 2023
79fddc7
Use Python 3.12
flomnes Nov 21, 2023
0d4eaad
release/v8.6.5 (#1934)
payetvin Feb 16, 2024
2d84118
change vcpkg init
payetvin Feb 16, 2024
09933a3
Merge branch 'release/8.6.x' of https://github.com/AntaresSimulatorTe…
payetvin Feb 16, 2024
fb24345
cherry pick a2a23c9
JasonMarechal25 Jul 19, 2023
69bea81
8.6.6 (#1999)
payetvin Mar 26, 2024
cef33e4
Version 8.6.7 (#2113)
payetvin May 27, 2024
e457a04
Release 8.6.8 (#2195)
payetvin Jun 28, 2024
3ba4878
cherry pick 252a107
payetvin Jul 9, 2024
d65a918
revision number
payetvin Jul 15, 2024
b022393
cherry pick 9cbf137
flomnes Mar 8, 2024
dab893f
cherry pick 9d9c7f6
flomnes Mar 13, 2024
44678a2
fix compile
payetvin Jul 16, 2024
e5886cf
fix link
payetvin Jul 16, 2024
55ad4ea
allow unsecure nodejs version for centos
payetvin Jul 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/centos7-system-deps-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,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: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/centos7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ env:
GITHUB_TOKEN: ${{ github.token }}
IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }}
IS_PUSH: ${{ github.event_name == 'push' }}
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

jobs:

Expand Down Expand Up @@ -48,7 +49,7 @@ jobs:

- name: Config OR-Tools URL
run: |
echo "URL_ORTOOLS=https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV
echo "URL_ORTOOLS=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV

- name: Download OR-Tools
id: ortools
Expand All @@ -65,7 +66,7 @@ jobs:
-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 \
-DCMAKE_PREFIX_PATH=${{ env.ORTOOLSDIR }}/install \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ runs:
wget https://github.com/AntaresSimulatorTeam/antares-deps/releases/download/v${{inputs.antares-deps-version}}/rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}.zip
unzip rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}.zip
rm -rf rte-antares-deps-${{inputs.os}}-${{inputs.buildtype}}.zip
echo "${GITHUB_WORKSPACE}/rte-antares-deps-Release/bin" >> $GITHUB_PATH

- name: Download & extract OR-Tools
shell: bash
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/oracle8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:

- name: Install libraries
run: |
dnf install -y epel-release git cmake wget rpm-build
dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-9-toolchain
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-9-toolchain zlib-devel

- name: Checkout
run: |
Expand All @@ -48,11 +48,10 @@ jobs:
run: |
source /opt/rh/gcc-toolset-9/enable
cmake -B _build -S src \
-DCMAKE_BUILD_TYPE=release \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTING=ON \
-DBUILD_UI=OFF \


- name: Build
run: |
source /opt/rh/gcc-toolset-9/enable
Expand Down
46 changes: 9 additions & 37 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
- main
- develop
- release/*
pull_request:

jobs:
sonarcloud:
Expand All @@ -22,51 +21,24 @@ jobs:
# https://sonarcloud.io/documentation/analysis/scan/sonarscanner/
SONAR_SERVER_URL: "https://sonarcloud.io"
ORTOOLS_DIR: ${{ github.workspace }}/or-tools
ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_ubuntu-20.04_static_sirius.zip"

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Config OR-Tools URL
run: |
echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV

- name: Install sonar-scanner and build-wrapper
uses: SonarSource/sonarcloud-github-c-cpp@v2

- name: ccache
uses: hendrikmuhs/[email protected]
with:
key: sonarcloud-${{ env.SONAR_SCANNER_VERSION }}

- name: Cache SonarCloud packages and analysis
uses: actions/cache@v3
id: sonarcloud-cache
with:
path: ~/.sonar
key: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}
restore-keys: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}

- name: Download and setup sonar-scanner
shell: bash
env:
SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
if: steps.sonarcloud-cache.outputs.cache-hit != 'true'
run: |
mkdir -p $HOME/.sonar
curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/

- name: Download and setup build-wrapper
shell: bash
env:
BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
if: steps.sonarcloud-cache.outputs.cache-hit != 'true'
run: |
curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/

- name: Set build-wrapper and sonar-scanner paths
run: |
echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH


- name: Install libraries
run: |
sudo apt-get update
Expand Down Expand Up @@ -113,7 +85,7 @@ jobs:
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-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 \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-system-deps-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- name: Configure
run: |
cmake -B _build -S src -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -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: |
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:

- name: Config OR-Tools URL
run: |
echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV
echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV

- name: Download pre-compiled librairies
uses: ./.github/workflows/download-extract-precompiled-libraries-tgz
Expand All @@ -72,7 +72,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.x
python-version: 3.12

- name: Install dependencies
run: |
Expand All @@ -90,14 +90,14 @@ jobs:
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DDEPS_INSTALL_DIR=${{github.workspace}}/rte-antares-deps-Release \
-DCMAKE_BUILD_TYPE=release \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTING=ON \
-DBUILD_not_system=OFF \
-DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install \

- name: Build
run: |
cmake --build _build --config release -j2
cmake --build _build -j$(nproc)

- name: Run unfeasibility-related tests
if: ${{ env.IS_PUSH == 'true' }}
Expand All @@ -118,13 +118,6 @@ jobs:
cd _build
ctest -C Release --output-on-failure -R kirchhoff

- name: Upload logs for failed tests
if: ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: test-log
path: ${{ github.workspace }}/_build/Testing/Temporary/LastTest.log

# simtest
- name: Read simtest version
id: simtest-version
Expand Down Expand Up @@ -197,6 +190,13 @@ jobs:
batch-name: long-tests-3
os: ${{ matrix.test-platform }}

- name: Upload logs for failed tests
if: ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: test-log
path: ${{ github.workspace }}/_build/Testing/Temporary/LastTest.log

- name: Installer .deb creation
run: |
cd _build
Expand Down
97 changes: 52 additions & 45 deletions .github/workflows/windows-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,24 @@ jobs:
# Indicates the location of the vcpkg as a Git submodule of the project repository.
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
ORTOOLS_DIR: ${{ github.workspace }}/or-tools
ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_windows-latest_static_sirius.zip"

steps:
- uses: actions/checkout@v3

- name: Config OR-Tools URL
run: |
echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_windows-latest_static_sirius.zip" >> $GITHUB_ENV
shell: bash

- name: Pre-requisites
shell: cmd
run: |
choco install wget unzip zip --no-progress

- name : Init VCPKG submodule
run: |
git submodule update --init vcpkg

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v3
Expand All @@ -47,15 +55,14 @@ jobs:
key: |
${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }}

- name: Setup Python 3.11
- name: Setup Python 3.12
uses: actions/setup-python@v4
with:
architecture: 'x64'
python-version: '3.11'
python-version: '3.12'

- name : Install deps with VCPKG
run: |
git submodule update --init vcpkg
cd vcpkg
./bootstrap-vcpkg.sh
vcpkg install ${{matrix.vcpkgPackages}} --triplet ${{matrix.triplet}}
Expand Down Expand Up @@ -96,7 +103,7 @@ jobs:
-DCMAKE_PREFIX_PATH="${{env.ORTOOLS_DIR}}/install" \
-DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \
-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \
-DCMAKE_BUILD_TYPE=release \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTING=ON \
-DBUILD_not_system=OFF

Expand All @@ -121,6 +128,46 @@ jobs:
shell: bash
run: rm -rf ${{ github.workspace }}/src/_build/_deps

- name: .zip creation
shell: bash
run: |
cd _build
cpack -G ZIP
export ZIP_NAME=$(ls *.zip)
echo "ZIP_NAME=$ZIP_NAME" >> $GITHUB_ENV

- name: Solver archive creation
shell: bash
run: |
cd _build
zip -r antares-solver_windows.zip solver/Release/antares-*-solver.exe solver/Release/*.dll

- name: NSIS Installer creation
shell: bash
run: |
rm -rf src/tests/resources/Antares_Simulator_Tests
rm -rf src/tests/resources/NonRegTests
cd _build
cpack -GNSIS
export NSIS_NAME=$(ls *.exe)
echo "NSIS_NAME=$NSIS_NAME" >> $GITHUB_ENV

- name: Upload NSIS logs
if: ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: NSISOutput.log
path: _build/_CPack_Packages/win64/NSIS/NSISOutput.log

- name: Upload release assets
uses: softprops/[email protected]
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
_build/${{env.NSIS_NAME}}
_build/${{env.ZIP_NAME}}
_build/solver.zip

# simtest
- name: Read simtest version
id: simtest-version
Expand Down Expand Up @@ -163,43 +210,3 @@ jobs:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
batch-name: long-tests-3
os: ${{ matrix.test-platform }}

- name: .zip creation
shell: bash
run: |
cd _build
cpack -G ZIP
export ZIP_NAME=$(ls *.zip)
echo "ZIP_NAME=$ZIP_NAME" >> $GITHUB_ENV

- name: Solver archive creation
shell: bash
run: |
cd _build
zip -r antares-solver_windows.zip solver/Release/antares-*-solver.exe solver/Release/*.dll

- name: NSIS Installer creation
shell: bash
run: |
rm -rf src/tests/resources/Antares_Simulator_Tests
rm -rf src/tests/resources/NonRegTests
cd _build
cpack -GNSIS
export NSIS_NAME=$(ls *.exe)
echo "NSIS_NAME=$NSIS_NAME" >> $GITHUB_ENV

- name: Upload NSIS logs
if: ${{ failure() }}
uses: actions/upload-artifact@v3
with:
name: NSISOutput.log
path: _build/_CPack_Packages/win64/NSIS/NSISOutput.log

- name: Upload release assets
uses: softprops/[email protected]
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
_build/${{env.NSIS_NAME}}
_build/${{env.ZIP_NAME}}
_build/solver.zip
Loading