Upgrade to Debian Stable/Ubuntu LTS, and Ruby 3.2

alphagov · Jun 6, 2024 · 912da6f · 912da6f
1 parent d9c7985
commit 912da6f
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 49 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   bundle-audit:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -32,15 +32,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -50,7 +50,7 @@ jobs:
           bundle exec rake bundle:audit
 
   brakeman:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -74,15 +74,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -92,7 +92,7 @@ jobs:
           bundle exec rake brakeman:check
 
   spec-admin-controllers:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -116,15 +116,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -138,7 +138,7 @@ jobs:
           bundle exec rake spec:controllers
 
   spec-public-controllers:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -162,15 +162,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -184,7 +184,7 @@ jobs:
           bundle exec rake spec:controllers
 
   spec-jobs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -208,15 +208,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -230,7 +230,7 @@ jobs:
           bundle exec rake spec:jobs
 
   spec-mailers:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -254,15 +254,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -276,7 +276,7 @@ jobs:
           bundle exec rake spec
 
   spec-models:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -300,15 +300,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -322,7 +322,7 @@ jobs:
           bundle exec rake spec
 
   spec-requests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -346,15 +346,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -368,7 +368,7 @@ jobs:
           bundle exec rake spec
 
   spec-other:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -392,15 +392,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -414,7 +414,7 @@ jobs:
           bundle exec rake spec
 
   javascript:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -438,15 +438,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -459,7 +459,7 @@ jobs:
           bundle exec rake jasmine:ci
 
   cucumber-admin:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -483,15 +483,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -524,7 +524,7 @@ jobs:
           bundle exec rake cucumber
 
   cucumber-public:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:
@@ -548,15 +548,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-22.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-22.04-gems-
+            ubuntu-24.04-gems-
 
       - name: Setup
         uses: ./.github/actions/setup

diff --git a/docker/ruby/Dockerfile b/docker/ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.0-bullseye
+FROM ruby:3.2-bookworm
 
 ENV BUNDLE_PATH=/bundle