Skip to content

CI quality of life #176

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

Merged
merged 4 commits into from
Jan 30, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/book_stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
jobs:
build-book:
runs-on: ubuntu-latest
container: ghcr.io/fenics/dolfinx/lab:v0.7.2
container: ghcr.io/fenics/dolfinx/lab:v0.7.3

env:
PYVISTA_TRAME_SERVER_PROXY_PREFIX: "/proxy/"
Expand All @@ -35,7 +35,8 @@ jobs:
- name: Build the book
run: jupyter-book build . -W

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if : always()
with:
name: webpage
path: ./_build/html
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@ jobs:
uses: actions/configure-pages@v4

- name: Download docs artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: webpage
path: "./public"

- name: Upload page artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: "./public"

- name: Deploy coverage report to GH Pages
id: deployment
uses: actions/deploy-pages@v3
uses: actions/deploy-pages@v4
10 changes: 5 additions & 5 deletions .github/workflows/publish_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,26 @@ jobs:
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ jobs:
- name: Test building the book
run: PYVISTA_OFF_SCREEN=false jupyter-book build -W .

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: webpage
path: ./_build/html
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
mpirun -n 2 python3 compiler_parameters.py

- name: Upload Navier-Stokes DFG 2D 3 plots
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: DFG2D-3
path: chapter2/figures
Expand Down
559 changes: 18 additions & 541 deletions chapter1/nitsche.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chapter1/nitsche.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# # Weak imposition of Dirichlet conditions for the Poisson problem
# Author: Jørgen S. Dokken
#
# In this section, we will go through how to solve the Poisson problem from the [Fundamentals](fundamentals.ipynb) tutorial using Nitsche's method {cite}`Nitsche1971`.
# In this section, we will go through how to solve the Poisson problem from the [Fundamentals](fundamentals_code.ipynb) tutorial using Nitsche's method {cite}`Nitsche1971`.
# The idea of weak imposition is that we add additional terms to the variational formulation to impose the boundary condition, instead of modifying the matrix system using strong imposition (lifting).
#
# We start by importing the required modules and creating the mesh and function space for our solution
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Execute from root of repo as: docker buildx build --platform=linux/arm64,linux/amd64 -f docker/Dockerfile ./docker/ --progress=plain

FROM ghcr.io/fenics/dolfinx/lab:v0.7.2
FROM ghcr.io/fenics/dolfinx/lab:v0.7.3
ARG TARGETPLATFORM


Expand Down Expand Up @@ -30,7 +30,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then python3 -m pip install "https
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then python3 -m pip install vtk; fi

ADD pyproject.toml /tmp/pyproject.toml
RUN python3 -m pip install --no-cache-dir --no-binary=h5py -v pyproject.toml
RUN python3 -m pip install --no-cache-dir --no-binary=h5py -v .
RUN python3 -m pip cache purge
RUN jupyter lab build
ENTRYPOINT ["jupyter", "lab", "--ip", "0.0.0.0", "--no-browser", "--allow-root"]
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ name = "DOLFINx_Tutorial"
version = "0.7.2"
dependencies = [
"jupyter-book",
# Pin docutils due to https://github.com/executablebooks/jupyter-book/issues/1970#issuecomment-1466051277
"docutils==0.17.1",
"meshio",
"h5py",
"seaborn",
Expand Down