Skip to content

Commit

Permalink
Revert branches (#114)
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgensd authored Apr 29, 2024
1 parent 86677c0 commit f83da73
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
build:
runs-on: ubuntu-22.04
container: ghcr.io/fenics/dolfinx/dev-env:v0.8.0-mpich
container: ghcr.io/fenics/dolfinx/dev-env:current-mpich
env:
# Directory that will be published on github pages
PUBLISH_DIR: ./_build/html
Expand All @@ -22,10 +22,10 @@ jobs:
- name: Install DOLFINx
uses: jorgensd/actions/[email protected]
with:
dolfinx: v0.8.0
ufl: 2024.1.0.post0
ffcx: v0.8.0
basix: v0.8.0
dolfinx: main
ufl: main
ffcx: main
basix: main
petsc_arch: ${PETSC_ARCH}

- name: Install DOLFINx-MPC (C++)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
# avoid running on pull requests from forks
# which don't have access to secrets
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
container: ghcr.io/fenics/dolfinx/dev-env:v0.8.0-mpich
container: ghcr.io/fenics/dolfinx/dev-env:current-mpich
env:
SONAR_SCANNER_VERSION: 5.0.1.3006 # Find the latest version in at: https://github.com/SonarSource/sonar-scanner-cli/tags
SONAR_SERVER_URL: "https://sonarcloud.io"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test_mpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: ghcr.io/fenics/dolfinx/dolfinx:v0.8.0
container: ghcr.io/fenics/dolfinx/dolfinx:nightly

strategy:
matrix:
Expand All @@ -37,10 +37,10 @@ jobs:
# - CC: clang
# CXX: c++
env:
DOLFINX_BRANCH: v0.8.0
BASIX_BRANCH: v0.8.0
UFL_BRANCH: 2024.1.0.post0
FFCX_BRANCH: v0.8.0
DOLFINX_BRANCH: main
BASIX_BRANCH: main
UFL_BRANCH: main
FFCX_BRANCH: main

CC: ${{ matrix.CC }}
CXX: ${{ matrix.CXX }}
Expand Down
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Main

- No changes

## v0.8.0

- **API**
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/fenics/dolfinx/dolfinx:v0.8.0
FROM ghcr.io/fenics/dolfinx/dolfinx:nightly

WORKDIR /tmp

Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build-backend = "scikit_build_core.build"

[project]
name = "dolfinx_mpc"
version = "0.8.0"
version = "0.8.0.dev0"
description = "DOLFINx_MPC Python interface"
readme = "README.md"
requires-python = ">=3.8.0"
Expand Down

0 comments on commit f83da73

Please sign in to comment.