From 9193829650ddf29d7bab5910dc442deb025530f3 Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Thu, 27 Feb 2025 10:14:39 +0100 Subject: [PATCH] Use latest host OS. Use dealii image. --- .github/workflows/linux.yml | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a313f08ea3..f2077f0bfb 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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: -- 2.39.5