Update dependencies workflow and Dockerfile for deal.II v9.6.0 support

dealii · Feb 27, 2025 · a5a3387 · a5a3387
1 parent 1be69ec
commit a5a3387
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -17,10 +17,10 @@ jobs:
       fail-fast: false
       matrix:
         system:
-          - ubuntu_version: "jammy"
+          - ubuntu_version: jammy
             dealii_version: 9.6.0-1~ubuntu22.04.1~ppa1
             tag: jammy-v9.6.0
-          - ubuntu_version: "noble"
+          - ubuntu_version: noble
             dealii_version: 9.6.0-1~ubuntu24.04.1~ppa1
             tag: noble-v9.6.0
 
@@ -47,7 +47,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push Docker image of dependencies ${{ matrix.system.ubuntu_version }}
+      - name: Build and push Docker image of dealii/dependencies:${{ matrix.system.ubuntu_version }}
         uses: docker/build-push-action@v5
         with:
           context: ./dependencies/
@@ -56,6 +56,8 @@ jobs:
           build-args: |
             IMG=${{ matrix.system.ubuntu_version }}
             VERSION=${{ matrix.system.dealii_version}}
+            REPO=ppa:ginggs/deal.ii-9.6.0-backports 
+            CLANG_VERSION=16
           platforms: linux/arm64,linux/amd64
           push: true
           tags: |

diff --git a/dependencies/Dockerfile b/dependencies/Dockerfile
@@ -2,11 +2,9 @@ ARG IMG=jammy
 
 FROM ubuntu:$IMG
 
-LABEL maintainer="luca.heltai@gmail.com"
-
 ARG VERSION=9.4.0-1ubuntu2~bpo22.04.1~ppa1
-ARG REPO=ppa:ginggs/deal.ii-9.4.0-backports
-ARG CLANG_VERSION=11
+ARG REPO=ppa:ginggs/deal.ii-9.6.0-backports
+ARG CLANG_VERSION=16
 
 USER root
 ENV DEBIAN_FRONTEND=noninteractive