Skip to content

Commit

Permalink
[MERGE] Develop + conflicts in management and utils
Browse files Browse the repository at this point in the history
  • Loading branch information
payetvin committed Oct 19, 2023
2 parents 356ef42 + 67d9d1d commit c052f8f
Show file tree
Hide file tree
Showing 118 changed files with 4,246 additions and 365 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: GitHub Pages

on:
push:
branches:
- develop # Set a branch name to trigger deployment

jobs:
deploy:
runs-on: ubuntu-22.04
permissions:
contents: write
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
steps:
- uses: actions/checkout@v3
with:
submodules: true # Fetch Hugo themes (true OR recursive)
fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod

- name: theme
run: |
git clone https://github.com/jothepro/doxygen-awesome-css.git
cd doxygen-awesome-css
git checkout v2.2.1
- name: Doxygen
uses: mattnotmitt/[email protected]
with:
doxyfile-path: docs/Doxyfile

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
# If you're changing the branch from main,
# also change the `main` in `refs/heads/main`
# below accordingly.
if: github.ref == 'refs/heads/develop'
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./html



5 changes: 3 additions & 2 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.12

- name: Install gcovr
run: sudo pip install gcovr==5.0 #5.1 generate issues with sonarcloud report parsing
Expand All @@ -86,7 +86,8 @@ jobs:
-DCMAKE_PREFIX_PATH="../install;${{ env.ORTOOLS_DIR }}/install" \
-DBUILD_TESTING=ON \
-DMZ_CODE_COVERAGE=ON \
-DBUILD_not_system=OFF
-DBUILD_not_system=OFF \
-DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}'
- name: Build
run: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ jobs:
ortools-dir: ${{env.ORTOOLS_DIR}}

- name: Set up Python
id: setup-python
uses: actions/setup-python@v4
with:
python-version: 3.x
python-version: '3.12'

- name: Install dependencies
run: |
Expand All @@ -87,7 +88,7 @@ jobs:
git submodule update --init src/antares-deps
git submodule update --init --remote --recursive src/tests/resources/Antares_Simulator_Tests
- name: Configure push
- name: Configure
run: |
cmake -B _build -S src \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
Expand All @@ -98,6 +99,7 @@ jobs:
-DBUILD_not_system=OFF \
-DBUILD_TOOLS=ON \
-DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install \
-DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}'
- name: Build
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/windows-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
uses: actions/setup-python@v4
with:
architecture: 'x64'
python-version: '3.11'
python-version: '3.12'

- name : Install deps with VCPKG
run: |
Expand Down Expand Up @@ -99,7 +99,8 @@ jobs:
-DCMAKE_BUILD_TYPE=release \
-DBUILD_TESTING=ON \
-DBUILD_TOOLS=ON \
-DBUILD_not_system=OFF
-DBUILD_not_system=OFF \
-DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}'
- name: Build
run: |
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/windows-vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ jobs:

- name: Setup Python 3.12
uses: actions/setup-python@v4
id: setup-python
with:
architecture: 'x64'
python-version: '3.12'
Expand All @@ -113,7 +114,8 @@ jobs:
-DCMAKE_BUILD_TYPE=release \
-DBUILD_TESTING=ON \
-DBUILD_TOOLS=ON \
-DBUILD_not_system=OFF
-DBUILD_not_system=OFF \
-DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}'
- name: Build
shell: bash
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ In May 2018 RTE decided to release the project under the GPLv3 license.

- Antares web site : https://antares-simulator.org
- RTE web site : http://www.rte-france.com/
- Doxygen code documentation : https://antaressimulatorteam.github.io/Antares_Simulator/


# Installation
Expand Down
Loading

0 comments on commit c052f8f

Please sign in to comment.