Merge pull request #2680 from yzytom/main

simon04 · web-flow · commit 989980c9c927 · 2026-06-01T21:20:26.000+02:00
let devdocs rely ruby 4.0.5, no longer rely ruby 3.x
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
     - name: Set up Ruby
-      uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+      uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
       with:
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
diff --git a/.github/workflows/schedule-doc-report.yml b/.github/workflows/schedule-doc-report.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
     - name: Set up Ruby
-      uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+      uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
       with:
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Generate report
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
     - name: Set up Ruby
-      uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
+      uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
       with:
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.4.8
+4.0.5
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.4.7
+FROM ruby:4.0.5
 ENV LANG=C.UTF-8
 ENV ENABLE_SERVICE_WORKER=true
 
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -1,4 +1,4 @@
-FROM ruby:3.4.7-alpine
+FROM ruby:4.0.5-alpine
 
 ENV LANG=C.UTF-8
 ENV ENABLE_SERVICE_WORKER=true
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
-ruby '3.4.8'
+ruby '4.0.5'
 
 gem 'activesupport', require: false
-gem 'html-pipeline'
+gem 'html-pipeline', '~> 2.14'
+gem 'ostruct'
 gem 'nokogiri'
 gem 'pry-byebug'
 gem 'rake'
@@ -55,3 +56,5 @@ if ENV['SELENIUM'] == '1'
   gem 'capybara'
   gem 'selenium-webdriver'
 end
+
+gem "webrick", "~> 1.9"
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/test/lib/docs/filters/core/images_test.rb b/test/lib/docs/filters/core/images_test.rb

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ruby:3.4.7`
	`1`	`+FROM ruby:4.0.5`
`2`	`2`	`ENV LANG=C.UTF-8`
`3`	`3`	`ENV ENABLE_SERVICE_WORKER=true`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ruby:3.4.7-alpine`
	`1`	`+FROM ruby:4.0.5-alpine`
`2`	`2`
`3`	`3`	`ENV LANG=C.UTF-8`
`4`	`4`	`ENV ENABLE_SERVICE_WORKER=true`