Skip to content

Commit

Permalink
Merge branch 'main' into dev/topology_visualization
Browse files Browse the repository at this point in the history
  • Loading branch information
sblauth committed Oct 25, 2023
2 parents 7a28a09 + 09cb14d commit 4a309b7
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ RUN micromamba install -y -n base -c conda-forge \
coverage">=7.1.0" \
mpich \
petsc"<=3.19" \
mpi4py"<=3.1.4" \
python=3.11 && \
micromamba clean --all --yes

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
TAG_PREFIX: ${{ steps.tag_name.outputs.TAG_PREFIX }}
steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Get tag name
id: tag_name
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Log into the Dockerhub registry
run: echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Log in to the Container registry
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ossar-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

# Ensure a compatible version of dotnet is installed.
# The [Microsoft Security Code Analysis CLI](https://aka.ms/mscadocs) is built with dotnet v3.1.201.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
rm -R /home/mambauser/cashocs
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Install cashocs
shell: bash
Expand All @@ -45,7 +45,7 @@ jobs:
steps:

- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1


- name: Get tag name
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Set up Python 3.11
uses: actions/setup-python@v4
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test_demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Install micromamba
uses: mamba-org/setup-micromamba@v1
Expand All @@ -30,6 +30,7 @@ jobs:
gmsh>=4.8
matplotlib
petsc<=3.19
mpi4py<=3.1.4
python=3.11
- name: Install package
Expand All @@ -55,7 +56,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Install micromamba
uses: mamba-org/setup-micromamba@v1
Expand All @@ -69,6 +70,7 @@ jobs:
mpich
matplotlib
petsc<=3.19
mpi4py<=3.1.4
python=3.11
- name: Install package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
rm -R /home/mambauser/cashocs
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Install cashocs
shell: bash
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Install micromamba
uses: mamba-org/setup-micromamba@v1
Expand All @@ -33,6 +33,7 @@ jobs:
pytest>=7.2.0
gmsh>=4.8
petsc<=3.19
mpi4py<=3.1.4
- name: Install package
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests_parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Install micromamba
uses: mamba-org/setup-micromamba@v1
Expand All @@ -36,6 +36,7 @@ jobs:
pytest>=7.2.0
gmsh>=4.8
petsc<=3.19
mpi4py<=3.1.4
${{ matrix.mpi }}
python=${{ matrix.python-version }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests_serial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4.1.1

- name: Install micromamba
uses: mamba-org/setup-micromamba@v1
Expand All @@ -33,6 +33,7 @@ jobs:
pytest>=7.2.0
gmsh>=4.8
petsc<=3.19
mpi4py<=3.1.4
python=${{ matrix.python-version }}
- name: Install package
Expand Down

0 comments on commit 4a309b7

Please sign in to comment.