From 8082551d3b236d49c730d34814f845a350929929 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Feb 2025 11:25:08 -0800 Subject: [PATCH 1/3] bring Ruby and bundler versions in line with main site --- .github/workflows/build.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 973735cb51..96a2061931 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1.6 + ruby-version: 3.2.6 bundler-cache: true - name: Set up coursier uses: coursier/setup-action@v1.3.5 diff --git a/Dockerfile b/Dockerfile index 636e38037b..b2bbc255f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ruby:3.1.6 +FROM ruby:3.2.6 -RUN gem install bundler:2.4.21 +RUN gem install bundler:2.6.5 WORKDIR /srv/jekyll From 4876fb5a3af58f745879833c311d8b0b0249b627 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Feb 2025 11:41:08 -0800 Subject: [PATCH 2/3] bundle update --- Gemfile.lock | 93 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 29 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1040918882..6240957b6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,10 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.2.1) + Ascii85 (2.0.1) + activesupport (8.0.1) base64 + benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) @@ -12,20 +14,34 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) + afm (0.2.2) + async (2.23.0) + console (~> 1.29) + fiber-annotation + io-event (~> 1.9) + metrics (~> 0.12) + traces (~> 0.15) base64 (0.2.0) - bigdecimal (3.1.8) + benchmark (0.4.0) + bigdecimal (3.1.9) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) colorator (1.1.0) - commonmarker (0.23.10) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) - csv (3.3.0) - dnsruby (1.72.2) + commonmarker (0.23.11) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + console (1.29.3) + fiber-annotation + fiber-local (~> 1.1) + json + csv (3.3.2) + dnsruby (1.72.3) + base64 (~> 0.2.0) simpleidn (~> 0.2.1) drb (2.2.1) em-websocket (0.5.3) @@ -34,15 +50,20 @@ GEM ethon (0.16.0) ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.9.1) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + execjs (2.10.0) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger - faraday-net_http (3.1.1) - net-http - ffi (1.17.0-arm64-darwin) - ffi (1.17.0-x64-mingw-ucrt) - ffi (1.17.0-x86_64-linux-gnu) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x64-mingw-ucrt) + ffi (1.17.1-x86_64-linux-gnu) + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) forwardable-extended (2.6.0) gemoji (4.1.0) github-pages (232) @@ -97,21 +118,23 @@ GEM octokit (>= 4, < 8) public_suffix (>= 3.0, < 6.0) typhoeus (~> 1.3) + hashery (2.1.2) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - html-proofer (4.4.3) + html-proofer (5.0.10) addressable (~> 2.3) - mercenary (~> 0.3) + async (~> 2.1) nokogiri (~> 1.13) - parallel (~> 1.10) + pdf-reader (~> 2.11) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) zeitwerk (~> 2.5) http_parser.rb (0.8.0) - i18n (1.14.5) + i18n (1.14.7) concurrent-ruby (~> 1.0) + io-event (1.9.0) jekyll (3.10.0) addressable (~> 2.4) colorator (~> 1.0) @@ -222,6 +245,7 @@ GEM gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) + json (2.10.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -230,14 +254,15 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.0) + logger (1.6.6) mercenary (0.3.6) + metrics (0.12.1) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.25.1) - net-http (0.4.1) + minitest (5.25.4) + net-http (0.6.0) uri nokogiri (1.18.3-arm64-darwin) racc (~> 1.4) @@ -248,18 +273,24 @@ GEM octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) - parallel (1.22.1) pathutil (0.16.2) forwardable-extended (~> 2.6) + pdf-reader (2.14.1) + Ascii85 (>= 1.0, < 3.0, != 2.0.0) + afm (~> 0.2.1) + hashery (~> 2.0) + ruby-rc4 + ttfunk public_suffix (5.1.1) racc (1.8.1) rainbow (3.1.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.9) + rexml (3.4.1) rouge (3.30.0) - rubyzip (2.3.2) + ruby-rc4 (0.1.5) + rubyzip (2.4.1) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -269,23 +300,27 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - securerandom (0.3.1) + securerandom (0.4.1) simpleidn (0.2.3) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) + traces (0.15.2) + ttfunk (1.8.0) + bigdecimal (~> 3.1) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (1.8.0) - uri (0.13.0) + uri (1.0.2) webrick (1.9.1) yell (2.2.2) - zeitwerk (2.6.7) + zeitwerk (2.7.2) PLATFORMS arm64-darwin-22 arm64-darwin-23 + arm64-darwin-24 x64-mingw-ucrt x86_64-linux @@ -295,4 +330,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.4.21 + 2.6.5 From 8b5afb910034731210aa6e8c95509add2ac8b553 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Feb 2025 11:47:16 -0800 Subject: [PATCH 3/3] update HTMLProofer flags for current version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96a2061931..451559d85c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,6 @@ jobs: --ignore-status-codes "400,401,403,429"\ --ignore-empty-alt\ --allow-hash-href\ - --enforce-https=false\ + --no-enforce-https\ --ignore-urls '/https://github.com/scala/,/www.oracle.com/'