From e9ef50e6557252467e9f3e6e043bb5839f9d3210 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 18:52:57 +0000 Subject: [PATCH 1/3] Bump rexml from 3.2.5 to 3.2.8 Bumps [rexml](https://github.com/ruby/rexml) from 3.2.5 to 3.2.8. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.5...v3.2.8) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 708511f5..0063c501 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,11 +50,13 @@ GEM rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.5) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (3.26.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) + strscan (3.1.0) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (1.7.0) From 4da49374e82648ad8fd776e9f4eb343225583458 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Wed, 5 Jun 2024 16:37:02 -0400 Subject: [PATCH 2/3] Update other gems necessary to build --- Gemfile | 2 +- Gemfile.lock | 66 +++++++++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/Gemfile b/Gemfile index 07a0c60f..ecded237 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -ruby '>=2.5.1' +ruby '>=2.7' source 'https://rubygems.org' gem 'jekyll', '>= 4.2.0' gem 'jekyll-redirect-from', '>= 0.16.0' diff --git a/Gemfile.lock b/Gemfile.lock index 0063c501..7373f40b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,65 +1,73 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.1.9) - em-websocket (0.5.2) + concurrent-ruby (1.3.1) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.3) + ffi (1.17.0) forwardable-extended (2.6.0) - http_parser.rb (0.6.0) - i18n (1.8.10) + google-protobuf (4.27.0) + bigdecimal + rake (>= 13) + http_parser.rb (0.8.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jekyll (4.2.0) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (2.1.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.3.1) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.5.1) + liquid (4.0.4) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - rb-fsevent (0.11.0) - rb-inotify (0.10.1) + public_suffix (5.0.5) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) rexml (3.2.8) strscan (>= 3.0.9) - rouge (3.26.0) + rouge (4.2.1) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) + sass-embedded (1.77.4) + google-protobuf (>= 3.25, < 5.0) + rake (>= 13) strscan (3.1.0) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) - unicode-display_width (1.7.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.5.0) + webrick (1.8.1) PLATFORMS ruby @@ -72,4 +80,4 @@ RUBY VERSION ruby 2.7.1p83 BUNDLED WITH - 2.2.15 + 2.5.9 From f81867434ce4c5be5b26a7e9e13b9f73a8939b2a Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Wed, 5 Jun 2024 16:39:49 -0400 Subject: [PATCH 3/3] Fix Github Actions build --- .github/workflows/jekyll.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/jekyll.yaml b/.github/workflows/jekyll.yaml index 54e809f1..34ab2464 100644 --- a/.github/workflows/jekyll.yaml +++ b/.github/workflows/jekyll.yaml @@ -27,14 +27,14 @@ on: jobs: jekyll: - timeout-minutes: 10 + timeout-minutes: 15 runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 3.2.2 - name: Cache gems uses: actions/cache@v3 with: @@ -48,10 +48,3 @@ jobs: bundle config path ~/vendor/bundle bundle install --jobs 4 --retry 3 bundle exec jekyll build - - name: Upload site - uses: actions/upload-artifact@v3 - with: - name: site - path: ./_site/ - if-no-files-found: ignore -