Skip to content

Commit 9d2413c

Browse files
committed
Try updating example paper workflows
1 parent 84cfe6a commit 9d2413c

File tree

5 files changed

+31
-21
lines changed

5 files changed

+31
-21
lines changed

.github/workflows/build_docs.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build:
2424
runs-on: ubuntu-22.04
2525
container:
26-
image: ghcr.io/scientificcomputing/fenics-gmsh:2023-08-16
26+
image: ghcr.io/scientificcomputing/fenics-gmsh:2024-02-19
2727

2828
env:
2929
# Directory that will be published on github pages
@@ -38,10 +38,9 @@ jobs:
3838
- name: Build docs
3939
run: jupyter book build -W .
4040

41-
4241
- name: Cache
4342
id: cache
44-
uses: actions/cache@v3
43+
uses: actions/cache@v4
4544
with:
4645
path: |
4746
~/.cache/pip
@@ -57,7 +56,7 @@ jobs:
5756
run: jupyter book build .
5857

5958
- name: Upload artifact
60-
uses: actions/upload-pages-artifact@v2
59+
uses: actions/upload-pages-artifact@v3
6160
with:
6261
path: ${{ env.PUBLISH_DIR }}
6362

@@ -78,7 +77,6 @@ jobs:
7877
- name: Setup Pages
7978
uses: actions/configure-pages@v3
8079

81-
8280
- name: Deploy to GitHub Pages
8381
id: deployment
84-
uses: actions/deploy-pages@v2
82+
uses: actions/deploy-pages@v4

.github/workflows/docker-image.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
name: Create and publish a Docker image
77

88
on:
9+
pull_request:
10+
branches: ["main"]
911
push:
10-
branches:
11-
- "!*"
1212
tags:
1313
- "v*"
1414

@@ -25,29 +25,41 @@ jobs:
2525

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Set up QEMU
31-
uses: docker/setup-qemu-action@v2
31+
uses: docker/setup-qemu-action@v3
3232

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

3636
- name: Log in to the Container registry
37-
uses: docker/login-action@v2
37+
uses: docker/login-action@v3
3838
with:
3939
registry: ${{ env.REGISTRY }}
4040
username: ${{ github.actor }}
4141
password: ${{ secrets.GITHUB_TOKEN }}
4242

4343
- name: Extract metadata (tags, labels) for Docker
4444
id: meta
45-
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
45+
uses: docker/metadata-action@v5
4646
with:
4747
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
4848

49-
- name: Build and push Docker image
50-
uses: docker/build-push-action@v3
49+
- name: Build local docker image
50+
uses: docker/build-push-action@v5
51+
with:
52+
context: .
53+
push: false
54+
load: true
55+
platforms: linux/amd64
56+
tags: ${{ steps.meta.outputs.tags }}
57+
labels: ${{ steps.meta.outputs.labels }}
58+
file: docker/Dockerfile
59+
60+
- name: Build and push Docker image (on tagged version)
61+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
62+
uses: docker/build-push-action@v5
5163
with:
5264
context: .
5365
push: true

.github/workflows/reproduce_results.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
branches: ["main"]
77
pull_request:
88
branches: ["main"]
9-
9+
schedule:
10+
- cron: "30 9 * * 1"
1011
# Allows you to run this workflow manually from the Actions tab
1112
workflow_dispatch:
1213
workflow_call:
1314

14-
1515
jobs:
1616
run:
1717
runs-on: ubuntu-22.04
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Cache
2525
id: cache
26-
uses: actions/cache@v3
26+
uses: actions/cache@v4
2727
with:
2828
path: |
2929
~/.cache/pip
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Upload artifact
5050
if: always()
51-
uses: actions/upload-artifact@v3
51+
uses: actions/upload-artifact@v4
5252
with:
5353
path: |
5454
./data/mesh

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/scientificcomputing/fenics-gmsh:2023-08-16
1+
FROM ghcr.io/scientificcomputing/fenics-gmsh:2024-02-19
22

33
ARG REPO_BRANCH="main"
44

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "my-fenics-paper"
7-
version = "0.3.0"
7+
version = "0.4.0"
88
dependencies = [
99
"h5py==3.9.0", # Pin to same version that is allready installed in the docker image
1010
"cardiac-geometries>=0.11.0",

0 commit comments

Comments
 (0)