Skip to content

Commit

Permalink
Use container precice/precice:develop in all Actions (#159)
Browse files Browse the repository at this point in the history
* [WIP] Make bindings compatible with precice:develop

* Updating solverdummy and checkpoint related API functions

* Removing unnecessary semicolons

* Add correct arguments to functions in SolverInterface.cpp

* Add size as input argument to mesh connectivity API functions for testing

* Remove incorrect bracket from deleted namespace

* [WIP] Using same names for input arguments of API functions

* correct return type for setMeshEdge in SolverInterface.cpp

* void function setMeshEdge should not return anything

* Adapted compatibility-precice-dev branch (#162)

* Use precice-setup-action

* Modify solverdummy Action

* Use precice-setup action appropriately in steps

* Change apt-get commands to use sudo in build and test workflows

* Change rm -rf commands to use sudo in build and test workflows

* Remove get_mesh_vertices and get_mesh_vertex_ids_from_positions

* Use precice-setup-action in Spack workflow

* Use main branch of setup-precice-action

* Use container precice/precice:develop

* Remove sudo from build-and-test.yml

* Use C++17 in setup.py

* Install sudo in workflows and use it to remove lock file

* Use user: root in setup_test workflow

* Remove sudo from the command to remove lock files

---------

Co-authored-by: Timo-Schrader <[email protected]>
  • Loading branch information
IshaanDesai and Timo-Schrader authored Mar 9, 2023
1 parent 3f8c34e commit 22a9d3a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 22 deletions.
27 changes: 9 additions & 18 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ jobs:
name: Run setup.py phases needed by spack
needs: [setup_test]
runs-on: ubuntu-latest
container:
image: benjaminrodenberg/precice:develop
options: --user root
container: precice/precice:develop
steps:
- name: Checkout Repository
uses: actions/checkout@v2
Expand All @@ -36,9 +34,7 @@ jobs:
setup_install:
name: Run setup install
runs-on: ubuntu-latest
container:
image: benjaminrodenberg/precice:develop
options: --user root
container: precice/precice:develop
steps:
- name: Checkout Repository
uses: actions/checkout@v2
Expand All @@ -61,9 +57,7 @@ jobs:
name: Run setup install --single-version-externally-managed (for spack)
needs: [setup_install]
runs-on: ubuntu-latest
container:
image: benjaminrodenberg/precice:develop
options: --user root
container: precice/precice:develop
steps:
- name: Checkout Repository
uses: actions/checkout@v2
Expand All @@ -88,10 +82,11 @@ jobs:
uses: actions/checkout@v2
- uses: actions/setup-python@v1
- name: Install OpenMPI, CMake, Boost library, Eigen and pkg-config
user: root
run: |
sudo apt-get -yy update
sudo apt-get install -y libopenmpi-dev cmake libboost-all-dev libeigen3-dev pkg-config
sudo rm -rf /var/lib/apt/lists/*
apt-get -yy update
apt-get install -y libopenmpi-dev cmake libboost-all-dev libeigen3-dev pkg-config
rm -rf /var/lib/apt/lists/*
- uses: BSFishy/pip-action@v1
with:
packages: toml
Expand All @@ -118,9 +113,7 @@ jobs:
name: Run pip install
needs: [setup_test]
runs-on: ubuntu-latest
container:
image: benjaminrodenberg/precice:develop
options: --user root
container: precice/precice:develop
steps:
- name: Checkout Repository
uses: actions/checkout@v2
Expand All @@ -139,9 +132,7 @@ jobs:
name: Run solverdummy
needs: [setup_install, setup_test]
runs-on: ubuntu-latest
container:
image: benjaminrodenberg/precice:develop
options: --user root
container: precice/precice:develop
steps:
- name: Checkout Repository
uses: actions/checkout@v2
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/run-solverdummy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ jobs:
run_solverdummies:
name: Run solverdummies
runs-on: ubuntu-latest
container:
image: benjaminrodenberg/precice:develop
options: --user root
container: precice/precice:develop
steps:
- name: Checkout Repository
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
def get_extensions(is_test):
compile_args = []
link_args = []
compile_args.append("-std=c++11")
compile_args.append("-std=c++17")
compile_args.append("-I{}".format(numpy.get_include()))

bindings_sources = [os.path.join(PYTHON_BINDINGS_PATH, "cyprecice",
Expand Down

0 comments on commit 22a9d3a

Please sign in to comment.