From f83da733c24c73d66ac08c3edfe8467175b2d970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Schartum=20Dokken?= Date: Mon, 29 Apr 2024 09:14:46 +0200 Subject: [PATCH] Revert branches (#114) --- .github/workflows/build_docs.yml | 10 +++++----- .github/workflows/sonarcloud.yml | 2 +- .github/workflows/test_mpc.yml | 10 +++++----- Changelog.md | 4 ++++ docker/Dockerfile | 2 +- python/pyproject.toml | 2 +- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index 8865c563..1da0944a 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -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 @@ -22,10 +22,10 @@ jobs: - name: Install DOLFINx uses: jorgensd/actions/install-dolfinx@v0.2.0 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++) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index de428cb9..ed8ab9c6 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -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" diff --git a/.github/workflows/test_mpc.yml b/.github/workflows/test_mpc.yml index d0344789..4539e36c 100644 --- a/.github/workflows/test_mpc.yml +++ b/.github/workflows/test_mpc.yml @@ -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: @@ -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 }} diff --git a/Changelog.md b/Changelog.md index a4c2b6fd..a2ec6983 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ # Changelog +## Main + +- No changes + ## v0.8.0 - **API** diff --git a/docker/Dockerfile b/docker/Dockerfile index 054f434f..3329540f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/fenics/dolfinx/dolfinx:v0.8.0 +FROM ghcr.io/fenics/dolfinx/dolfinx:nightly WORKDIR /tmp diff --git a/python/pyproject.toml b/python/pyproject.toml index 7307af21..bd58332e 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -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"