From cd0de149ddeca6bfe596b7b7a20bb642ba10a1e1 Mon Sep 17 00:00:00 2001
From: Danial Pearce <danial.pearce@gmail.com>
Date: Tue, 23 Apr 2024 12:57:33 +1000
Subject: [PATCH 1/2] Upgrade all the rubies - use 3.3 by default

---
 .github/workflows/ruby.yml | 2 +-
 Dockerfile                 | 4 ++--
 auto/release-gem           | 2 +-
 auto/ruby-2.7              | 2 +-
 auto/ruby-3.0              | 2 +-
 auto/ruby-3.1              | 2 +-
 auto/ruby-3.2              | 6 ++++++
 auto/ruby-3.3              | 6 ++++++
 auto/test                  | 6 ++++++
 9 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100755 auto/ruby-3.2
 create mode 100755 auto/ruby-3.3

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index a766028..8761c16 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3']
 
     steps:
     - uses: actions/checkout@v3
diff --git a/Dockerfile b/Dockerfile
index 92bcbc7..a50c656 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.1-alpine@sha256:499a310e8fab835ad47ab6251302aba1fd6ba91ebdfa22d621f495a5d0ded170 as build
+FROM ruby:3.3-alpine@sha256:447495d87e72344ac35f14afd4bebd635eaafcaf3f147ebb72a15fa555b8584e as build
 
 WORKDIR /app
 COPY bin /app/bin
@@ -10,7 +10,7 @@ COPY LICENSE.md /app/
 COPY stackup.gemspec /app/
 RUN gem build stackup.gemspec
 
-FROM ruby:3.1-alpine@sha256:499a310e8fab835ad47ab6251302aba1fd6ba91ebdfa22d621f495a5d0ded170
+FROM ruby:3.3-alpine@sha256:447495d87e72344ac35f14afd4bebd635eaafcaf3f147ebb72a15fa555b8584e
 
 MAINTAINER https://github.com/realestate-com-au/stackup
 
diff --git a/auto/release-gem b/auto/release-gem
index 7417124..6c3039a 100755
--- a/auto/release-gem
+++ b/auto/release-gem
@@ -10,4 +10,4 @@ git fetch origin
 git diff origin/main --exit-code
 
 echo "--- Releasing gem"
-docker run --rm -itw /cwd -v "$PWD:/cwd" ruby:3.1-alpine auto/release-in-docker
+docker run --rm -itw /cwd -v "$PWD:/cwd" ruby:3.3-alpine auto/release-in-docker
diff --git a/auto/ruby-2.7 b/auto/ruby-2.7
index 01c2fc3..ff4c1f0 100755
--- a/auto/ruby-2.7
+++ b/auto/ruby-2.7
@@ -3,4 +3,4 @@
 set -eu -o pipefail
 cd $(dirname $0)/..
 
-RUBY_IMAGE="ruby:2.7@sha256:3d9c2a2d305318710c9e5a4ee001e07e227f356a40e0b6003d8440835d430770" exec auto/ruby "${@}"
+RUBY_IMAGE="ruby:2.7@sha256:2347de892e419c7160fc21dec721d5952736909f8c3fbb7f84cb4a07aaf9ce7d" exec auto/ruby "${@}"
diff --git a/auto/ruby-3.0 b/auto/ruby-3.0
index 9106875..d0e0669 100755
--- a/auto/ruby-3.0
+++ b/auto/ruby-3.0
@@ -3,4 +3,4 @@
 set -eu -o pipefail
 cd $(dirname $0)/..
 
-RUBY_IMAGE="ruby:3.0@sha256:dfb439f51e6ba58810fed23e4c4582f3e3c24e6a972ec505de27217f5036c567" exec auto/ruby "${@}"
+RUBY_IMAGE="ruby:3.0@sha256:3d4f1647953941c19b6d0176c0a3e1f373aa7b0553d1c8aba51789721151f953" exec auto/ruby "${@}"
diff --git a/auto/ruby-3.1 b/auto/ruby-3.1
index 9f2e81c..0e1da67 100755
--- a/auto/ruby-3.1
+++ b/auto/ruby-3.1
@@ -3,4 +3,4 @@
 set -eu -o pipefail
 cd $(dirname $0)/..
 
-RUBY_IMAGE="ruby:3.1@sha256:ffdb4e42cf4663e10c32d3ea91312b61df931b41439c16f7b88a7f6e70a65b6d" exec auto/ruby "${@}"
+RUBY_IMAGE="ruby:3.1@sha256:8ebc619f459ec62a7d0763f910e50787cc7999de3c09632536b22aaf8725d3f1" exec auto/ruby "${@}"
diff --git a/auto/ruby-3.2 b/auto/ruby-3.2
new file mode 100755
index 0000000..cf1dc91
--- /dev/null
+++ b/auto/ruby-3.2
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+cd $(dirname $0)/..
+
+RUBY_IMAGE="ruby:3.2@sha256:9ee6e94ab254ec61fd08472976a8d0a04d9745de76e9768ccd33f0b7d2fd1be9" exec auto/ruby "${@}"
diff --git a/auto/ruby-3.3 b/auto/ruby-3.3
new file mode 100755
index 0000000..7efffb0
--- /dev/null
+++ b/auto/ruby-3.3
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+cd $(dirname $0)/..
+
+RUBY_IMAGE="ruby:3.3@sha256:8eb6fb9ea8d522506913b420fbaecace30c15f545fb86a8cf7406179e7efa3fd" exec auto/ruby "${@}"
diff --git a/auto/test b/auto/test
index 152f6e8..a4614cb 100755
--- a/auto/test
+++ b/auto/test
@@ -3,6 +3,12 @@
 set -eu -o pipefail
 cd $(dirname $0)/..
 
+echo "+++ Running specs for ruby 3.3"
+./auto/ruby-3.3 rspec
+
+echo "+++ Running specs for ruby 3.2"
+./auto/ruby-3.2 rspec
+
 echo "+++ Running specs for ruby 3.1"
 ./auto/ruby-3.1 rspec
 

From 09a07c5291c736b7a7ce9bf4475f8bf7fc1a1270 Mon Sep 17 00:00:00 2001
From: Danial Pearce <danial.pearce@gmail.com>
Date: Tue, 23 Apr 2024 14:22:43 +1000
Subject: [PATCH 2/2] Remove ruby 2.7 and 3.0 as they are EOL

---
 .github/workflows/ruby.yml | 2 +-
 auto/lint                  | 2 +-
 auto/ruby-2.7              | 6 ------
 auto/ruby-3.0              | 6 ------
 auto/test                  | 6 ------
 5 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100755 auto/ruby-2.7
 delete mode 100755 auto/ruby-3.0

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 8761c16..bb2204c 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3']
+        ruby-version: ['3.1', '3.2', '3.3']
 
     steps:
     - uses: actions/checkout@v3
diff --git a/auto/lint b/auto/lint
index f435b3e..9fcbf9c 100755
--- a/auto/lint
+++ b/auto/lint
@@ -5,4 +5,4 @@ cd $(dirname $0)/..
 
 echo "+++ Running linter"
 # We lint on the lowest supported ruby version
-./auto/ruby-2.7 rubocop
+./auto/ruby-3.1 rubocop
diff --git a/auto/ruby-2.7 b/auto/ruby-2.7
deleted file mode 100755
index ff4c1f0..0000000
--- a/auto/ruby-2.7
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu -o pipefail
-cd $(dirname $0)/..
-
-RUBY_IMAGE="ruby:2.7@sha256:2347de892e419c7160fc21dec721d5952736909f8c3fbb7f84cb4a07aaf9ce7d" exec auto/ruby "${@}"
diff --git a/auto/ruby-3.0 b/auto/ruby-3.0
deleted file mode 100755
index d0e0669..0000000
--- a/auto/ruby-3.0
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu -o pipefail
-cd $(dirname $0)/..
-
-RUBY_IMAGE="ruby:3.0@sha256:3d4f1647953941c19b6d0176c0a3e1f373aa7b0553d1c8aba51789721151f953" exec auto/ruby "${@}"
diff --git a/auto/test b/auto/test
index a4614cb..9b368ab 100755
--- a/auto/test
+++ b/auto/test
@@ -11,9 +11,3 @@ echo "+++ Running specs for ruby 3.2"
 
 echo "+++ Running specs for ruby 3.1"
 ./auto/ruby-3.1 rspec
-
-echo "+++ Running specs for ruby 3.0"
-./auto/ruby-3.0 rspec
-
-echo "+++ Running specs for ruby 2.7"
-./auto/ruby-2.7 rspec