Merge pull request #901 from github/ruby-3x

yoannchaudet · web-flow · commit 3fb2b0823f3d · 2024-02-06T10:42:47.000-08:00
Bring back proper support for Ruby 3.x
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -8,6 +8,8 @@ jobs:
       matrix:
         ruby:
           - '3.0'
+          - '3.1'
+          - '3.2'
           - '3.3'
     steps:
     - uses: actions/checkout@v4
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,

-Original file line number
+Diff line change
       matrix:
         ruby:
           - '3.0'
 +          - '3.1'
 +          - '3.2'
           - '3.3'
     steps:
     - uses: actions/checkout@v4
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ def self.version_report`
`63`	`63`	`require "nokogiri"`
`64`	`64`
`65`	`65`	`{`
`66`		`- "ruby" => "3.3",`
	`66`	`+ "ruby" => RUBY_VERSION,`
`67`	`67`
`68`	`68`	`# Gem versions we're curious about`
`69`	`69`	`"github-pages" => VERSION.to_s,`