From f77ab9707b80a892a12178832a7b19413282b66b Mon Sep 17 00:00:00 2001
From: Bruno Blais <blais.bruno@gmail.com>
Date: Tue, 20 Aug 2024 08:27:04 -0400
Subject: [PATCH] Update CI version and rename files (#1251)

Description
The CI used to run deal.II 9.5. Now that the 9.6 major release is out, switch the CI to 9.6 and renable the CI. Also, I changed the names of the yml files to make them more uniform
---
 .github/workflows/{clang_tidy.yml => clang-tidy.yml}          | 0
 .github/workflows/{main_debug.yml => debug.yml}               | 4 ++--
 ...{main_parameter_files.yml => examples-parameter-files.yml} | 0
 .github/workflows/{main_release.yml => release.yml}           | 4 ++--
 .github/workflows/{main_warnings.yml => warnings-gcc.yml}     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename .github/workflows/{clang_tidy.yml => clang-tidy.yml} (100%)
 rename .github/workflows/{main_debug.yml => debug.yml} (94%)
 rename .github/workflows/{main_parameter_files.yml => examples-parameter-files.yml} (100%)
 rename .github/workflows/{main_release.yml => release.yml} (96%)
 rename .github/workflows/{main_warnings.yml => warnings-gcc.yml} (93%)

diff --git a/.github/workflows/clang_tidy.yml b/.github/workflows/clang-tidy.yml
similarity index 100%
rename from .github/workflows/clang_tidy.yml
rename to .github/workflows/clang-tidy.yml
diff --git a/.github/workflows/main_debug.yml b/.github/workflows/debug.yml
similarity index 94%
rename from .github/workflows/main_debug.yml
rename to .github/workflows/debug.yml
index 2af98dc52b..0c8e43b431 100644
--- a/.github/workflows/main_debug.yml
+++ b/.github/workflows/debug.yml
@@ -31,11 +31,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dealii_version: ["master"]
+        dealii_version: ["master-focal", "v9.6.0-jammy"]
     
     # Run steps in container of dealii's master branch
     container:
-      image: dealii/dealii:${{ matrix.dealii_version }}-focal
+      image: dealii/dealii:${{ matrix.dealii_version }}
       options: --user root
 
     steps:
diff --git a/.github/workflows/main_parameter_files.yml b/.github/workflows/examples-parameter-files.yml
similarity index 100%
rename from .github/workflows/main_parameter_files.yml
rename to .github/workflows/examples-parameter-files.yml
diff --git a/.github/workflows/main_release.yml b/.github/workflows/release.yml
similarity index 96%
rename from .github/workflows/main_release.yml
rename to .github/workflows/release.yml
index f0d5d2b127..83cafa3882 100644
--- a/.github/workflows/main_release.yml
+++ b/.github/workflows/release.yml
@@ -29,11 +29,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dealii_version: ["master", "v9.5.0"]
+        dealii_version: ["master-focal", "v9.6.0-jammy"]
     
     # Run steps in container of dealii's master branch
     container:
-      image: dealii/dealii:${{ matrix.dealii_version }}-focal
+      image: dealii/dealii:${{ matrix.dealii_version }}
       options: --user root
 
     steps:
diff --git a/.github/workflows/main_warnings.yml b/.github/workflows/warnings-gcc.yml
similarity index 93%
rename from .github/workflows/main_warnings.yml
rename to .github/workflows/warnings-gcc.yml
index 2a76ee695c..48bfcfbbcd 100644
--- a/.github/workflows/main_warnings.yml
+++ b/.github/workflows/warnings-gcc.yml
@@ -29,11 +29,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dealii_version: ["master", "v9.5.0"]
+        dealii_version: ["master-focal", "v9.6.0-jammy"]
     
     # Run steps in container of dealii's master branch
     container:
-      image: dealii/dealii:${{ matrix.dealii_version }}-focal
+      image: dealii/dealii:${{ matrix.dealii_version }}
       options: --user root
 
     steps: