-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/8.6.x' of https://github.com/AntaresSimulatorTe…
…am/Antares_Simulator into release/8.6.x
- Loading branch information
Showing
35 changed files
with
208 additions
and
220 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,6 @@ on: | |
- main | ||
- develop | ||
- release/* | ||
pull_request: | ||
|
||
jobs: | ||
sonarcloud: | ||
|
@@ -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 | ||
|
@@ -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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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: | | ||
|
@@ -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' }} | ||
|
@@ -118,61 +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 | ||
|
||
- name: Installer .deb creation | ||
run: | | ||
cd _build | ||
cpack -G DEB | ||
- name: .tar.gz creation | ||
run: | | ||
cd _build | ||
cpack -G TGZ | ||
- name: Solver archive creation | ||
run: | | ||
cd _build | ||
cmake --install . --prefix install | ||
pushd . | ||
cd install/bin | ||
tar czf ../../antares-solver_ubuntu20.04.tar.gz antares-*-solver libsirius_solver.so | ||
popd | ||
rm -rf install | ||
- name: Installer archive upload push | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
path: _build/*.tar.gz | ||
|
||
- name: Installer deb upload push | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
path: _build/*.deb | ||
|
||
publish_assets: | ||
name: Publish assets | ||
needs: build | ||
runs-on: ${{needs.build.outputs.os}} | ||
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", "*/*.deb"]' | ||
|
||
# simtest | ||
- name: Read simtest version | ||
id: simtest-version | ||
|
@@ -245,3 +190,57 @@ 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 | ||
cpack -G DEB | ||
- name: .tar.gz creation | ||
run: | | ||
cd _build | ||
cpack -G TGZ | ||
- name: Solver archive creation | ||
run: | | ||
cd _build | ||
cmake --install . --prefix install | ||
pushd . | ||
cd install/bin | ||
tar czf ../../antares-solver_ubuntu20.04.tar.gz antares-*-solver libsirius_solver.so | ||
popd | ||
rm -rf install | ||
- name: Installer archive upload push | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
path: _build/*.tar.gz | ||
|
||
- name: Installer deb upload push | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
path: _build/*.deb | ||
|
||
publish_assets: | ||
name: Publish assets | ||
needs: build | ||
runs-on: ${{needs.build.outputs.os}} | ||
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", "*/*.deb"]' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
v9.5-rte2.0 | ||
v9.8-rte1.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"version": "v8.6.0c" | ||
"version": "v8.6.4" | ||
} |
Oops, something went wrong.