Skip to content

Commit ad93a46

Browse files
JanNiklasBJanNiklasB
committed
added ninja to workflows
1 parent 033af5e commit ad93a46

File tree

7 files changed

+37
-35
lines changed

7 files changed

+37
-35
lines changed

‎.github/workflows/create_coverage_report.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Prerequirements
2424
run: |
2525
sudo apt-get update
26-
sudo apt-get install libmuparser-dev libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov doxygen graphviz
26+
sudo apt-get install libmuparser-dev libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov doxygen graphviz ninja-build
2727
sudo apt-get install pandoc # do not only use pip to install pandoc, see https://stackoverflow.com/questions/62398231/building-docs-fails-due-to-missing-pandoc
2828
pip install -r doc/pages/example_notebooks/requirements.txt # load requirements for notebooks
2929
pip install sphinx==7.2.6 sphinx_rtd_theme m2r2 nbsphinx lxml_html_clean breathe pandoc exhale # load requirements for documentation
@@ -35,20 +35,20 @@ jobs:
3535
run: |
3636
mkdir build
3737
cd build
38-
cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=OFF -DENABLE_COVERAGE=On
38+
cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=OFF -DENABLE_COVERAGE=On
3939
- name: Build CRPropa
4040
run: |
4141
cd build
42-
make -j
42+
cmake --build .
4343
- name: run test
4444
run: |
4545
cd build
46-
make test
46+
ctest --output-on-failure
4747
continue-on-error: true
4848
- name: coverage report
4949
run: |
5050
cd build
51-
make coverage
51+
cmake --build . --target coverage
5252
tar -zcvf coverage.tar.gz coverageReport
5353
- name: archive documentation
5454
uses: actions/upload-artifact@v4

‎.github/workflows/create_documentation.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Prerequirements
2525
run: |
2626
sudo apt-get update
27-
sudo apt-get install libmuparser-dev libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov doxygen graphviz
27+
sudo apt-get install libmuparser-dev libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov doxygen graphviz ninja-build
2828
sudo apt-get install pandoc # do not only use pip to install pandoc, see https://stackoverflow.com/questions/62398231/building-docs-fails-due-to-missing-pandoc
2929
pip install -r doc/pages/example_notebooks/requirements.txt # load requirements for notebooks
3030
pip install sphinx==7.2.6 sphinx_rtd_theme m2r2 nbsphinx lxml_html_clean breathe pandoc exhale # load requirements for documentation
@@ -36,24 +36,24 @@ jobs:
3636
run: |
3737
mkdir build
3838
cd build
39-
cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On
39+
cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On
4040
- name: Build CRPropa
4141
run: |
4242
cd build
43-
make -j
43+
cmake --build .
4444
- name: run test
4545
run: |
4646
cd build
47-
make test
47+
ctest --output-on-failure
4848
continue-on-error: true
4949
- name: coverage report
5050
run: |
5151
cd build
52-
make coverage
52+
cmake --build . --target coverage
5353
- name: build documentation
5454
run: |
5555
cd build
56-
make doc
56+
cmake --build . --target doc
5757
cp -r coverageReport doc/pages/coverageReport
5858
tar -zcvf documentation.tar.gz doc
5959
- name: archive documentation

‎.github/workflows/deploy_new_documentation.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Prerequirements
2929
run: |
3030
sudo apt-get update
31-
sudo apt-get install libmuparser-dev libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov doxygen graphviz
31+
sudo apt-get install libmuparser-dev libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov doxygen graphviz ninja-build
3232
sudo apt-get install pandoc # do not only use pip to install pandoc, see https://stackoverflow.com/questions/62398231/building-docs-fails-due-to-missing-pandoc
3333
pip install -r doc/pages/example_notebooks/requirements.txt # load requirements for notebooks
3434
pip install sphinx==7.2.6 sphinx_rtd_theme m2r2 nbsphinx lxml_html_clean breathe pandoc exhale # load requirements for documentation
@@ -40,24 +40,24 @@ jobs:
4040
run: |
4141
mkdir build
4242
cd build
43-
cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On
43+
cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/ -DBUILD_DOC=On -DENABLE_COVERAGE=On
4444
- name: Build CRPropa
4545
run: |
4646
cd build
47-
make -j
47+
cmake --build .
4848
- name: run test
4949
run: |
5050
cd build
51-
make test
51+
ctest --output-on-failure
5252
continue-on-error: true
5353
- name: coverage report
5454
run: |
5555
cd build
56-
make coverage
56+
cmake --build . --target coverage
5757
- name: build documentation
5858
run: |
5959
cd build
60-
make doc
60+
cmake --build . --target doc
6161
- name: move final documentation # to avoid conflict with .gitignore
6262
run: |
6363
mv build/doc ~/final_doc

‎.github/workflows/test_examples.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Preinstall
2222
run: |
2323
sudo apt-get update
24-
sudo apt-get install libmuparser-dev python3 python3-dev python3-setuptools python-setuptools libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov
24+
sudo apt-get install libmuparser-dev python3 python3-dev python3-setuptools python-setuptools libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov ninja-build
2525
pip3 install -r doc/pages/example_notebooks/requirements.txt # load requrements for notebooks
2626
pip3 install --upgrade Pygments
2727
- name: Set up the build
@@ -32,11 +32,12 @@ jobs:
3232
run: |
3333
mkdir build
3434
cd build
35-
cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/
35+
cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX=$HOME/.local -DENABLE_PYTHON=True -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_TESTING=Off -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native -DPython_INSTALL_PACKAGE_DIR=/home/runner/.local/
3636
- name: Build CRPropa
3737
run: |
3838
cd build
39-
make install -j
39+
cmake --build .
40+
cmake --install .
4041
- name: convert notebooks to python
4142
env:
4243
PYTHONPATH: "/home/runner/.local"

‎.github/workflows/testing_OSX.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v4
2020
- name: Preinstall
2121
run: |
22-
brew install hdf5 fftw cfitsio muparser libomp swig
22+
brew install hdf5 fftw cfitsio muparser libomp swig ninja
2323
python3 -m venv venv
2424
source venv/bin/activate
2525
python -m pip install --upgrade pip
@@ -36,6 +36,7 @@ jobs:
3636
cd build
3737
3838
cmake .. \
39+
-G Ninja \
3940
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/venv \
4041
-DENABLE_PYTHON=True \
4142
-DPython_EXECUTABLE=$GITHUB_WORKSPACE/venv/bin/python \
@@ -46,13 +47,13 @@ jobs:
4647
- name: Build CRPropa
4748
run: |
4849
cd build
49-
make
50+
cmake --build .
5051
- name: Run tests
5152
env:
5253
CRPROPA_DATA_PATH: "/Users/runner/work/CRPropa3/CRPropa3/build/data"
5354
run: |
5455
cd build
55-
make test
56+
ctest --output-on-failure
5657
- name: Archive test results
5758
if: always()
5859
uses: actions/upload-artifact@v4

‎.github/workflows/testing_ubuntu22.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Preinstall
2222
run: |
2323
sudo apt-get update
24-
sudo apt-get install libmuparser-dev python3 python3-setuptools libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov
24+
sudo apt-get install libmuparser-dev python3 python3-setuptools libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov ninja-build
2525
pip install --upgrade pip
2626
pip install numpy
2727
pip show numpy
@@ -33,15 +33,15 @@ jobs:
3333
run: |
3434
mkdir build
3535
cd build
36-
cmake .. -DENABLE_PYTHON=True -DENABLE_TESTING=On -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
36+
cmake .. -G Ninja -DENABLE_PYTHON=True -DENABLE_TESTING=On -DPython_EXECUTABLE=${{ matrix.config.py }} -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS=native
3737
- name: Build CRPropa
3838
run: |
3939
cd build
40-
make
40+
cmake --build .
4141
- name: Run tests
4242
run: |
4343
cd build
44-
make test
44+
ctest --output-on-failure
4545
- name: Archive test results
4646
if: always()
4747
uses: actions/upload-artifact@v4

‎.github/workflows/testing_ubuntu24.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Preinstall
2222
run: |
2323
sudo apt-get update
24-
sudo apt-get install libmuparser-dev python-dev-is-python3 libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov
24+
sudo apt-get install libmuparser-dev python-dev-is-python3 libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov ninja-build
2525
pip install numpy
2626
- name: Set up the build
2727
env:
@@ -31,15 +31,15 @@ jobs:
3131
run: |
3232
mkdir build
3333
cd build
34-
cmake .. -DENABLE_PYTHON=True -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS="none"
34+
cmake .. -G Ninja -DENABLE_PYTHON=True -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS="none"
3535
- name: Build CRPropa
3636
run: |
3737
cd build
38-
make
38+
cmake --build .
3939
- name: Run tests
4040
run: |
4141
cd build
42-
make test
42+
ctest --output-on-failure
4343
- name: Archive test results
4444
if: always()
4545
uses: actions/upload-artifact@v4
@@ -65,7 +65,7 @@ jobs:
6565
- name: Preinstall
6666
run: |
6767
sudo apt-get update
68-
sudo apt-get install libmuparser-dev python-dev-is-python3 libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov
68+
sudo apt-get install libmuparser-dev python-dev-is-python3 libhdf5-serial-dev libomp5 libomp-dev libfftw3-dev libcfitsio-dev lcov ninja-build
6969
pip install numpy
7070
pip show numpy
7171
- name: Set up the build
@@ -76,15 +76,15 @@ jobs:
7676
run: |
7777
mkdir build
7878
cd build
79-
cmake .. -DENABLE_PYTHON=True -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS="none"
79+
cmake .. -G Ninja -DENABLE_PYTHON=True -DENABLE_TESTING=On -DENABLE_SWIG_BUILTIN=${{ matrix.config.swig_builtin }} -DSIMD_EXTENSIONS="none"
8080
- name: Build CRPropa
8181
run: |
8282
cd build
83-
make
83+
cmake --build .
8484
- name: Run tests
8585
run: |
8686
cd build
87-
make test
87+
ctest --output-on-failure
8888
- name: Archive test results
8989
if: always()
9090
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)