From a92449c5a0dedf1979b98c92ad2d50be08ec3c16 Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Fri, 28 Feb 2025 16:57:27 -0500
Subject: [PATCH] drop support for Ubuntu 20.04 and Ruby 2.7 (#4188)

* drop support for Ubuntu 20.04 and Ruby 2.7

* Bump ood_packaging to also remove Ubuntu 20.04 and E2E helper

---------

Co-authored-by: Trey Dockendorf <tdockendorf@osc.edu>
---
 .github/workflows/tests.yml | 7 ++-----
 Gemfile                     | 2 +-
 Gemfile.lock                | 4 ++--
 spec/e2e/e2e_helper.rb      | 2 --
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 413edf095..0ffc7075f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,8 +13,8 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        ruby: ["2.7.1"]
-        bundler: ["2.1.4"]
+        ruby: ["3.3.5"]
+        bundler: ["2.5.16"]
         include:
           # Test versions from Ubuntu 22.04
           - os: ubuntu-latest
@@ -125,7 +125,6 @@ jobs:
           - el8
           - el9
           - amzn2023
-          - ubuntu-20.04
           - ubuntu-22.04
           - ubuntu-24.04
           - debian-12
@@ -142,8 +141,6 @@ jobs:
           - dist: amzn2023
             arch: ppc64le
           # Ubuntu and Debian doesn't have way to get NodeJS 20+ on ppc64le
-          - dist: ubuntu-20.04
-            arch: ppc64le
           - dist: ubuntu-22.04
             arch: ppc64le
           - dist: ubuntu-24.04
diff --git a/Gemfile b/Gemfile
index a26a16e50..b49670a84 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'rake'
 gem 'dotenv', '~> 2.1'
 
 group :package do
-  gem 'ood_packaging', '~> 0.16.2'
+  gem 'ood_packaging', '~> 0.17.0'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index c94ba1905..bcf58805d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,7 +96,7 @@ GEM
     oga (3.3)
       ast
       ruby-ll (~> 2.1)
-    ood_packaging (0.16.2)
+    ood_packaging (0.17.0)
       rake (~> 13.0.1)
     open_uri_redirections (0.2.1)
     parallel (1.21.0)
@@ -177,7 +177,7 @@ DEPENDENCIES
   beaker-docker (~> 1.4.0)
   beaker-rspec
   dotenv (~> 2.1)
-  ood_packaging (~> 0.16.2)
+  ood_packaging (~> 0.17.0)
   rake
   rspec
   rubocop
diff --git a/spec/e2e/e2e_helper.rb b/spec/e2e/e2e_helper.rb
index 670e144ee..b54cfe40a 100644
--- a/spec/e2e/e2e_helper.rb
+++ b/spec/e2e/e2e_helper.rb
@@ -73,8 +73,6 @@ def codename
     'noble'
   when 'ubuntu-22.04'
     'jammy'
-  when 'ubuntu-20.04'
-    'focal'
   when 'debian-12'
     'bookworm'
   end