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

GHA: further cleanup #2202

Merged
merged 1 commit into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .github/workflows/deploy_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ jobs:
- run: echo "AMICI_DIR=$(pwd)" >> $GITHUB_ENV

- name: sdist
run: |
scripts/buildSdist.sh
run: scripts/buildSdist.sh

- name: Publish a Python distribution to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_benchmark_collection_models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:

# install AMICI
- name: Create AMICI sdist
run: |
pip3 install build && cd python/sdist && python3 -m build --sdist
run: pip3 install build && cd python/sdist && python3 -m build --sdist

- name: Install AMICI sdist
run: |
pip3 install --user petab[vis] && \
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@ jobs:
- name: Set up doxygen
uses: ./.github/actions/setup-doxygen

# install amici dependencies
- name: apt
- name: Install apt dependencies
uses: ./.github/actions/install-apt-dependencies

- name: Install further dependencies
run: |
sudo apt-get update \
&& sudo apt-get install -y \
g++ \
libatlas-base-dev \
libboost-serialization-dev \
pandoc \
python3-venv \
python3-venv

- uses: ./.github/actions/setup-swig
- name: Set up SWIG
uses: ./.github/actions/setup-swig

- name: sphinx
- name: Run sphinx
run: scripts/run-sphinx.sh
30 changes: 10 additions & 20 deletions .github/workflows/test_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,16 @@ jobs:
cmake

- name: Build suitesparse
run: |
scripts/buildSuiteSparse.sh
run: scripts/buildSuiteSparse.sh

- name: Build sundials
run: |
scripts/buildSundials.sh
run: scripts/buildSundials.sh

- name: Build AMICI
run: |
scripts/buildAmici.sh
run: scripts/buildAmici.sh

- name: Install python archive
run: |
scripts/installAmiciArchive.sh
run: scripts/installAmiciArchive.sh

sdist_ubuntu:
name: sdist Install Ubuntu
Expand All @@ -71,16 +67,13 @@ jobs:
uses: ./.github/actions/install-apt-dependencies

- name: Create AMICI sdist
run: |
scripts/buildSdist.sh
run: scripts/buildSdist.sh

- name: Install python sdist
run: |
pip3 install -v --user $(ls -t python/sdist/dist/amici-*.tar.gz | head -1)
run: pip3 install -v --user $(ls -t python/sdist/dist/amici-*.tar.gz | head -1)

- name: Test import
run: |
python -m amici
run: python -m amici


sdist_macos:
Expand Down Expand Up @@ -113,13 +106,10 @@ jobs:
&& echo CPPFLAGS="-I /usr/local/Cellar/boost/1.81.0_1/include/" >> $GITHUB_ENV

- name: Create AMICI sdist
run: |
scripts/buildSdist.sh
run: scripts/buildSdist.sh

- name: Install python sdist
run: |
pip3 install -v --user $(ls -t python/sdist/dist/amici-*.tar.gz | head -1)
run: pip3 install -v --user $(ls -t python/sdist/dist/amici-*.tar.gz | head -1)

- name: Test import
run: |
python -m amici
run: python -m amici
6 changes: 2 additions & 4 deletions .github/workflows/test_petab_test_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ jobs:
&& sudo apt-get install -y python3-venv

- name: Build BNGL
run: |
scripts/buildBNGL.sh
run: scripts/buildBNGL.sh

- run: |
echo "${HOME}/.local/bin/" >> $GITHUB_PATH
Expand All @@ -54,8 +53,7 @@ jobs:

# install AMICI
- name: Install python package
run: |
scripts/installAmiciSource.sh
run: scripts/installAmiciSource.sh

- name: Install petab
run: |
Expand Down
38 changes: 12 additions & 26 deletions .github/workflows/test_python_cplusplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,20 @@ jobs:
sudo apt-get update \
&& sudo apt-get install -y \
cmake \
g++ \
python3-venv \
lcov \
libboost-math-dev
lcov

- name: Build AMICI dependencies
run: |
scripts/buildDependencies.sh
run: scripts/buildDependencies.sh

- name: Build AMICI
run: |
CI_SONARCLOUD=TRUE scripts/buildAmici.sh
run: CI_SONARCLOUD=TRUE scripts/buildAmici.sh

- name: C++ tests
run: |
scripts/run-cpp-tests.sh
run: scripts/run-cpp-tests.sh

- name: Install python package
run: |
scripts/installAmiciSource.sh
run: scripts/installAmiciSource.sh

- name: Python tests
run: |
Expand Down Expand Up @@ -98,12 +92,10 @@ jobs:
&& pip install jax[cpu]

- name: example notebooks
run: |
scripts/runNotebook.sh python/examples/example_*/
run: scripts/runNotebook.sh python/examples/example_*/

- name: doc notebooks
run: |
scripts/runNotebook.sh documentation/GettingStarted.ipynb
run: scripts/runNotebook.sh documentation/GettingStarted.ipynb

- name: Codecov Python
uses: codecov/[email protected]
Expand Down Expand Up @@ -143,7 +135,6 @@ jobs:

osx:
name: Tests OSX

runs-on: macos-latest

steps:
Expand All @@ -170,21 +161,16 @@ jobs:
&& echo CPPFLAGS="-I /usr/local/Cellar/boost/1.81.0_1/include/" >> $GITHUB_ENV

- name: Build AMICI
run: |
scripts/buildAll.sh
run: scripts/buildAll.sh

- name: Install python package
run: |
scripts/installAmiciSource.sh
run: scripts/installAmiciSource.sh

- name: cppcheck
run: |
scripts/run-cppcheck.sh
run: scripts/run-cppcheck.sh

- name: Python tests
run: |
scripts/run-python-tests.sh
run: scripts/run-python-tests.sh

- name: C++ tests
run: |
scripts/run-cpp-tests.sh
run: scripts/run-cpp-tests.sh
6 changes: 2 additions & 4 deletions .github/workflows/test_python_ver_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,9 @@ jobs:

# install AMICI
- name: Build BNGL
run: |
scripts/buildBNGL.sh
run: scripts/buildBNGL.sh
- name: Install python package
run: |
scripts/installAmiciSource.sh
run: scripts/installAmiciSource.sh

- name: Python tests
run: |
Expand Down
17 changes: 5 additions & 12 deletions .github/workflows/test_valgrind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ on:
jobs:
valgrind_cpp:
name: Valgrind C++

# TODO: prepare image with more deps preinstalled
runs-on: ubuntu-22.04

strategy:
Expand Down Expand Up @@ -47,12 +45,10 @@ jobs:
valgrind

- name: Build AMICI
run: |
scripts/buildAll.sh
run: scripts/buildAll.sh

- name: C++ tests / Valgrind
run: |
scripts/run-valgrind-cpp.sh
run: scripts/run-valgrind-cpp.sh

valgrind_python:
name: Valgrind Python
Expand Down Expand Up @@ -88,13 +84,10 @@ jobs:
valgrind

- name: Build AMICI
run: |
scripts/buildAll.sh
run: scripts/buildAll.sh

- name: Install python package
run: |
scripts/installAmiciSource.sh
run: scripts/installAmiciSource.sh

- name: Python tests / Valgrind
run: |
scripts/run-valgrind-py.sh
run: scripts/run-valgrind-py.sh