From 29e529b537a091403930671f3a4fd7acc597d550 Mon Sep 17 00:00:00 2001
From: Yoann Chaudet <c.yoann@gmail.com>
Date: Mon, 5 Feb 2024 21:05:52 -0800
Subject: [PATCH 1/2] Bring back proper support for Docker 3.x

---
 .github/workflows/push.yml       | 6 ++++--
 Dockerfile                       | 3 ---
 lib/github-pages/dependencies.rb | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ffb1ee7f..847bb76c 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -7,8 +7,10 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '3.0'
-          - '3.3'
+          - 3.0
+          - 3.1
+          - 3.2
+          - 3.3
     steps:
     - uses: actions/checkout@v4
     - name: script/cibuild-docker
diff --git a/Dockerfile b/Dockerfile
index f0746a25..3caedbfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,9 +8,6 @@ RUN apt-get update \
     make \
     nodejs
 
-# final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0
-RUN gem update --system
-
 COPY .git /src/gh/pages-gem/.git
 COPY Gemfile* /src/gh/pages-gem/
 COPY github-pages.gemspec /src/gh/pages-gem
diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb
index ad782395..bf41272b 100644
--- a/lib/github-pages/dependencies.rb
+++ b/lib/github-pages/dependencies.rb
@@ -63,7 +63,7 @@ def self.version_report
       require "nokogiri"
 
       {
-        "ruby" => "3.3",
+        "ruby" => RUBY_VERSION,
 
         # Gem versions we're curious about
         "github-pages" => VERSION.to_s,

From 9a20094dda4a7a99fbb7900b0c66fc558cd32319 Mon Sep 17 00:00:00 2001
From: Yoann Chaudet <yoannchaudet@github.com>
Date: Tue, 6 Feb 2024 09:46:37 -0800
Subject: [PATCH 2/2] Update .github/workflows/push.yml

---
 .github/workflows/push.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 847bb76c..84143356 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -7,10 +7,10 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 3.0
-          - 3.1
-          - 3.2
-          - 3.3
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
     steps:
     - uses: actions/checkout@v4
     - name: script/cibuild-docker