Skip to content

Commit 530d360

Browse files
authored
CI quality of life (#176)
* Remove jupyterbook pin * Bump dolfinx version in dockerfile and fix error. * Bump actions in all workflows * Fix reference
1 parent 82c5262 commit 530d360

File tree

9 files changed

+35
-558
lines changed

9 files changed

+35
-558
lines changed

.github/workflows/book_stable.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
jobs:
1616
build-book:
1717
runs-on: ubuntu-latest
18-
container: ghcr.io/fenics/dolfinx/lab:v0.7.2
18+
container: ghcr.io/fenics/dolfinx/lab:v0.7.3
1919

2020
env:
2121
PYVISTA_TRAME_SERVER_PROXY_PREFIX: "/proxy/"
@@ -35,7 +35,8 @@ jobs:
3535
- name: Build the book
3636
run: jupyter-book build . -W
3737

38-
- uses: actions/upload-artifact@v3
38+
- uses: actions/upload-artifact@v4
39+
if : always()
3940
with:
4041
name: webpage
4142
path: ./_build/html

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ jobs:
4747
uses: actions/configure-pages@v4
4848

4949
- name: Download docs artifact
50-
uses: actions/download-artifact@v3
50+
uses: actions/download-artifact@v4
5151
with:
5252
name: webpage
5353
path: "./public"
5454

5555
- name: Upload page artifact
56-
uses: actions/upload-pages-artifact@v2
56+
uses: actions/upload-pages-artifact@v3
5757
with:
5858
path: "./public"
5959

6060
- name: Deploy coverage report to GH Pages
6161
id: deployment
62-
uses: actions/deploy-pages@v3
62+
uses: actions/deploy-pages@v4

.github/workflows/publish_docker.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@ jobs:
2323
uses: actions/checkout@v4
2424

2525
- name: Set up QEMU
26-
uses: docker/setup-qemu-action@v2
26+
uses: docker/setup-qemu-action@v3
2727

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

3131
- name: Log in to the Container registry
32-
uses: docker/login-action@v2
32+
uses: docker/login-action@v3
3333
with:
3434
registry: ${{ env.REGISTRY }}
3535
username: ${{ github.actor }}
3636
password: ${{ secrets.GITHUB_TOKEN }}
3737

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

4444
- name: Build and push Docker image
45-
uses: docker/build-push-action@v3
45+
uses: docker/build-push-action@v5
4646
with:
4747
context: .
4848
push: true

.github/workflows/test_nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ jobs:
8585
- name: Test building the book
8686
run: PYVISTA_OFF_SCREEN=false jupyter-book build -W .
8787

88-
- uses: actions/upload-artifact@v3
88+
- uses: actions/upload-artifact@v4
89+
if: always()
8990
with:
9091
name: webpage
9192
path: ./_build/html

.github/workflows/test_stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
mpirun -n 2 python3 compiler_parameters.py
7373
7474
- name: Upload Navier-Stokes DFG 2D 3 plots
75-
uses: actions/upload-artifact@v3
75+
uses: actions/upload-artifact@v4
7676
with:
7777
name: DFG2D-3
7878
path: chapter2/figures

chapter1/nitsche.ipynb

Lines changed: 18 additions & 541 deletions
Large diffs are not rendered by default.

chapter1/nitsche.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# # Weak imposition of Dirichlet conditions for the Poisson problem
1717
# Author: Jørgen S. Dokken
1818
#
19-
# 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`.
19+
# 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`.
2020
# 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).
2121
#
2222
# We start by importing the required modules and creating the mesh and function space for our solution

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Execute from root of repo as: docker buildx build --platform=linux/arm64,linux/amd64 -f docker/Dockerfile ./docker/ --progress=plain
22

3-
FROM ghcr.io/fenics/dolfinx/lab:v0.7.2
3+
FROM ghcr.io/fenics/dolfinx/lab:v0.7.3
44
ARG TARGETPLATFORM
55

66

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

3232
ADD pyproject.toml /tmp/pyproject.toml
33-
RUN python3 -m pip install --no-cache-dir --no-binary=h5py -v pyproject.toml
33+
RUN python3 -m pip install --no-cache-dir --no-binary=h5py -v .
3434
RUN python3 -m pip cache purge
3535
RUN jupyter lab build
3636
ENTRYPOINT ["jupyter", "lab", "--ip", "0.0.0.0", "--no-browser", "--allow-root"]

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ name = "DOLFINx_Tutorial"
77
version = "0.7.2"
88
dependencies = [
99
"jupyter-book",
10-
# Pin docutils due to https://github.com/executablebooks/jupyter-book/issues/1970#issuecomment-1466051277
11-
"docutils==0.17.1",
1210
"meshio",
1311
"h5py",
1412
"seaborn",

0 commit comments

Comments
 (0)