]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Use latest host OS. Use dealii image. 18099/head
authorMarc Fehling <mafehling.git@gmail.com>
Thu, 27 Feb 2025 09:14:39 +0000 (10:14 +0100)
committerMarc Fehling <mafehling.git@gmail.com>
Thu, 27 Feb 2025 09:15:50 +0000 (10:15 +0100)
.github/workflows/linux.yml

index a313f08ea35c6043bc1e0b2c8486d39f88e60a0c..f2077f0bfbe03c33a7b4f3ddacb093893e9cc6c5 100644 (file)
@@ -31,8 +31,8 @@ jobs:
   linux-release-serial:
     # simple serial release build using g++
 
-    name: ${{ matrix.os }} release serial
-    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.ubuntu_version }} release serial
+    runs-on: ubuntu-24.04
 
     #
     # The following condition only runs the workflow on 'push' or if the
@@ -45,14 +45,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-        - os: ubuntu-22.04
-          image: dealii/dependencies:jammy
-        - os: ubuntu-24.04
-          image: masterleinad/dependencies-dealii:noble
+        ubuntu_version: [jammy, noble]
 
     container:
-      image: ${{ matrix.image }}
+      image: dealii/dependencies:${{ matrix.ubuntu_version }}
       options: --user root
 
     steps:
@@ -95,8 +91,8 @@ jobs:
   linux-debug-parallel:
     # simple parallel debug build using g++
 
-    name: ${{ matrix.os }} debug parallel
-    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.ubuntu_version }} debug parallel
+    runs-on: ubuntu-24.04
 
     #
     # The following condition only runs the workflow on 'push' or if the
@@ -109,14 +105,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-        - os: ubuntu-22.04
-          image: dealii/dependencies:jammy
-        - os: ubuntu-24.04
-          image: masterleinad/dependencies-dealii:noble
+        ubuntu_version: [jammy, noble]
 
     container:
-      image: ${{ matrix.image }}
+      image: dealii/dependencies:${{ matrix.ubuntu_version }}
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
     steps:
@@ -167,8 +159,8 @@ jobs:
   linux-debug-parallel-tpetra:
     # simple parallel debug build using g++ and trilinos+tpetra
 
-    name: ${{ matrix.os }} debug parallel tpetra
-    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.ubuntu_version }} debug parallel tpetra
+    runs-on: ubuntu-24.04
 
     #
     # The following condition only runs the workflow on 'push' or if the
@@ -181,14 +173,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-        - os: ubuntu-22.04
-          image: dealii/dependencies:jammy
-        - os: ubuntu-24.04
-          image: masterleinad/dependencies-dealii:noble
+        ubuntu_version: [jammy, noble]
 
     container:
-      image: ${{ matrix.image }}
+      image: dealii/dependencies:${{ matrix.ubuntu_version }}
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
     steps:

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.