Bring back proper support for Docker 3.x

github · Feb 6, 2024 · 29e529b · 29e529b
1 parent 974872f
commit 29e529b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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,