From da403897654edabe8dc623fd1203e766a2acfc02 Mon Sep 17 00:00:00 2001
From: Matt Borland <matt@mattborland.com>
Date: Wed, 16 Apr 2025 15:49:53 -0400
Subject: [PATCH 1/2] Move ubuntu 20.04 runs into containers

---
 .github/workflows/ci.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 056a62cda6..d8e3ca226c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,19 +76,22 @@ jobs:
           - toolset: gcc-9
             cxxstd: "17,2a"
             address_model: 64
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu-20.04
             install:
               - g++-9-multilib
           - toolset: gcc-9
             cxxstd: "17-gnu,2a-gnu"
             address_model: 64
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu-20.04
             install:
               - g++-9-multilib
           - toolset: gcc-10
             cxxstd: "17,20"
             address_model: 64
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu-20.04
             install:
               - g++-10-multilib
           - toolset: gcc-11
@@ -174,13 +177,15 @@ jobs:
           - toolset: clang
             compiler: clang++-9
             cxxstd: "17,2a"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu-20.04
             install:
               - clang-9
           - toolset: clang
             compiler: clang++-10
             cxxstd: "17,20"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu-20.04
             install:
               - clang-10
           - toolset: clang
@@ -531,8 +536,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { os: ubuntu-20.04, build_shared: ON,  build_type: Debug, generator: 'Unix Makefiles' }
-          - { os: ubuntu-20.04, build_shared: OFF, build_type: Debug, generator: 'Unix Makefiles' }
+          - { os: ubuntu-22.04, build_shared: ON,  build_type: Debug, generator: 'Unix Makefiles' }
+          - { os: ubuntu-22.04, build_shared: OFF, build_type: Debug, generator: 'Unix Makefiles' }
           - { os: windows-2019, build_shared: ON,  build_type: Debug, generator: 'Visual Studio 16 2019' }
           - { os: windows-2019, build_shared: OFF, build_type: Debug, generator: 'Visual Studio 16 2019' }
 

From e5d5b9a984e979d2d2a773d272caa7644028105a Mon Sep 17 00:00:00 2001
From: Matt Borland <matt@mattborland.com>
Date: Wed, 16 Apr 2025 15:53:22 -0400
Subject: [PATCH 2/2] Fix syntax error

---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d8e3ca226c..883c095381 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,21 +77,21 @@ jobs:
             cxxstd: "17,2a"
             address_model: 64
             os: ubuntu-latest
-            container: ubuntu-20.04
+            container: ubuntu:20.04
             install:
               - g++-9-multilib
           - toolset: gcc-9
             cxxstd: "17-gnu,2a-gnu"
             address_model: 64
             os: ubuntu-latest
-            container: ubuntu-20.04
+            container: ubuntu:20.04
             install:
               - g++-9-multilib
           - toolset: gcc-10
             cxxstd: "17,20"
             address_model: 64
             os: ubuntu-latest
-            container: ubuntu-20.04
+            container: ubuntu:20.04
             install:
               - g++-10-multilib
           - toolset: gcc-11
@@ -178,14 +178,14 @@ jobs:
             compiler: clang++-9
             cxxstd: "17,2a"
             os: ubuntu-latest
-            container: ubuntu-20.04
+            container: ubuntu:20.04
             install:
               - clang-9
           - toolset: clang
             compiler: clang++-10
             cxxstd: "17,20"
             os: ubuntu-latest
-            container: ubuntu-20.04
+            container: ubuntu:20.04
             install:
               - clang-10
           - toolset: clang