Merge pull request #3 from dunkmann00/update-github-pages

Update github-pages to jekyll-v4-github-pages
dunkmann00 · Jan 2, 2023 · 242a51b · 242a51b
2 parents ee33f7d + ffc1012
commit 242a51b
Show file tree

Hide file tree

Showing 50 changed files with 126 additions and 124 deletions.
diff --git a/.github/workflows/record.yml b/.github/workflows/record.yml
@@ -16,7 +16,7 @@ jobs:
       tag: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.regex-match.outputs.tag_match }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Get action.yaml tag
         id: regex-match
         run: |

diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Manage our dependency on the version of the github-pages gem here.
-gem "github-pages", "= 227"
+gem "jekyll-v4-github-pages", "= 229"
 
 # Explicitly include this gem here.
 # It is not directly included in the github-pages gem list of dependencies,

diff --git a/bin/record_expected_output b/bin/record_expected_output
@@ -7,7 +7,7 @@ if [ "local" = "$1" ]; then
 
   for dir in test_projects/*
   do
-    bundle exec github-pages build --verbose -s "${dir}" -d "${dir}/_expected"
+    bundle exec jekyll-v4-github-pages build --verbose -s "${dir}" -d "${dir}/_expected"
   done
 else
   act -b -s GITHUB_TOKEN -j record-expected-output

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -11,11 +11,11 @@ set -o errexit
 SOURCE_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_SOURCE
 DESTINATION_DIRECTORY=${GITHUB_WORKSPACE}/$INPUT_DESTINATION
 PAGES_GEM_HOME=$BUNDLE_APP_CONFIG
-GITHUB_PAGES=$PAGES_GEM_HOME/bin/github-pages
+GITHUB_PAGES=$PAGES_GEM_HOME/bin/jekyll-v4-github-pages
 
-# Check if Gemfile's dependencies are satisfied or print a warning 
+# Check if Gemfile's dependencies are satisfied or print a warning
 if test -e "$SOURCE_DIRECTORY/Gemfile" && ! bundle check --dry-run --gemfile "$SOURCE_DIRECTORY/Gemfile" >/dev/null 2>&1; then
-  echo "::warning:: github-pages can't satisfy your Gemfile's dependencies."
+  echo "::warning:: jekyll-v4-github-pages can't satisfy your Gemfile's dependencies."
 fi
 
 # Set environment variables required by supported plugins

diff --git a/test_projects/future-false/_expected/2020/02/13/the-future-is-looking-bright.html b/test_projects/future-false/_expected/2020/02/13/the-future-is-looking-bright.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
-<html lang="en-US">
+<html lang="en-US" data-color-mode="light" data-light-theme="light">
   <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
 <!-- Begin Jekyll SEO tag v2.8.0 -->
 <title>The Future is Looking Bright! | jekyll-build-pages</title>
-<meta name="generator" content="Jekyll v3.9.2" />
+<meta name="generator" content="Jekyll v4.3.1" />
 <meta property="og:title" content="The Future is Looking Bright!" />
 <meta property="og:locale" content="en_US" />
 <meta name="description" content="Everything’s coming up Milhouse." />

diff --git a/test_projects/future-false/_expected/assets/css/style.css b/test_projects/future-false/_expected/assets/css/style.css
diff --git a/test_projects/future-false/_expected/assets/css/style.css.map b/test_projects/future-false/_expected/assets/css/style.css.map
diff --git a/test_projects/future-true/_expected/2020/02/13/the-future-is-looking-bright.html b/test_projects/future-true/_expected/2020/02/13/the-future-is-looking-bright.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
-<html lang="en-US">
+<html lang="en-US" data-color-mode="light" data-light-theme="light">
   <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
 <!-- Begin Jekyll SEO tag v2.8.0 -->
 <title>The Future is Looking Bright! | jekyll-build-pages</title>
-<meta name="generator" content="Jekyll v3.9.2" />
+<meta name="generator" content="Jekyll v4.3.1" />
 <meta property="og:title" content="The Future is Looking Bright!" />
 <meta property="og:locale" content="en_US" />
 <meta name="description" content="Everything’s coming up Milhouse." />

diff --git a/test_projects/future-true/_expected/2022/03/01/we-live-in-hell.html b/test_projects/future-true/_expected/2022/03/01/we-live-in-hell.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
-<html lang="en-US">
+<html lang="en-US" data-color-mode="light" data-light-theme="light">
   <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
 <!-- Begin Jekyll SEO tag v2.8.0 -->
 <title>We Live In Hell | jekyll-build-pages</title>
-<meta name="generator" content="Jekyll v3.9.2" />
+<meta name="generator" content="Jekyll v4.3.1" />
 <meta property="og:title" content="We Live In Hell" />
 <meta property="og:locale" content="en_US" />
 <meta name="description" content="And it’s not even the cool hell that [redacted] are afraid of. 😭" />

diff --git a/test_projects/future-true/_expected/assets/css/style.css b/test_projects/future-true/_expected/assets/css/style.css
diff --git a/test_projects/future-true/_expected/assets/css/style.css.map b/test_projects/future-true/_expected/assets/css/style.css.map
diff --git a/test_projects/jekyll-include-cache/_expected/assets/css/style.css b/test_projects/jekyll-include-cache/_expected/assets/css/style.css
diff --git a/test_projects/jekyll-include-cache/_expected/assets/css/style.css.map b/test_projects/jekyll-include-cache/_expected/assets/css/style.css.map
diff --git a/test_projects/jekyll-include-cache/_expected/index.html b/test_projects/jekyll-include-cache/_expected/index.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
-<html lang="en-US">
+<html lang="en-US" data-color-mode="light" data-light-theme="light">
   <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
 <!-- Begin Jekyll SEO tag v2.8.0 -->
 <title>jekyll-build-pages | A simple GitHub Action for producing Jekyll build artifacts compatible with GitHub Pages.</title>
-<meta name="generator" content="Jekyll v3.9.2" />
+<meta name="generator" content="Jekyll v4.3.1" />
 <meta property="og:title" content="jekyll-build-pages" />
 <meta property="og:locale" content="en_US" />
 <meta name="description" content="A simple GitHub Action for producing Jekyll build artifacts compatible with GitHub Pages." />

diff --git a/test_projects/mojombo/Gemfile b/test_projects/mojombo/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
+gem 'jekyll-v4-github-pages', group: :jekyll_plugins
diff --git a/test_projects/mojombo/Gemfile.lock b/test_projects/mojombo/Gemfile.lock
@@ -1,20 +1,18 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.6)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
+    coffee-script-source (1.12.2)
     colorator (1.1.0)
-    commonmarker (0.23.6)
     concurrent-ruby (1.1.10)
     dnsruby (1.61.9)
       simpleidn (~> 0.1)
@@ -31,96 +29,48 @@ GEM
     faraday-net_http (3.0.2)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (227)
-      github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.2)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.2.0)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
-      jekyll-include-cache (= 0.2.1)
-      jekyll-mentions (= 1.6.0)
-      jekyll-optional-front-matter (= 0.3.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.16.0)
-      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.3)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.8.0)
-      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.2.0)
-      jekyll-theme-cayman (= 0.2.0)
-      jekyll-theme-dinky (= 0.2.0)
-      jekyll-theme-hacker (= 0.2.0)
-      jekyll-theme-leap-day (= 0.2.0)
-      jekyll-theme-merlot (= 0.2.0)
-      jekyll-theme-midnight (= 0.2.0)
-      jekyll-theme-minimal (= 0.2.0)
-      jekyll-theme-modernist (= 0.2.0)
-      jekyll-theme-primer (= 0.6.0)
-      jekyll-theme-slate (= 0.2.0)
-      jekyll-theme-tactile (= 0.2.0)
-      jekyll-theme-time-machine (= 0.2.0)
-      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.2)
-      kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.3)
-      mercenary (~> 0.3)
-      minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
-      rouge (= 3.26.0)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.17.9)
+    gemoji (4.0.1)
+    github-pages-health-check (1.18.1)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
       octokit (~> 4.0)
       public_suffix (>= 3.0, < 5.0)
       typhoeus (~> 1.3)
+    google-protobuf (3.21.12-x86_64-darwin)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.2)
+    jekyll (4.3.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-avatar (0.8.0)
       jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
+    jekyll-coffeescript (2.0.0)
       coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.4.0)
-      commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.2.0)
-      commonmarker (~> 0.23.4)
-      jekyll (~> 3.9.0)
-      jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 4.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
+      coffee-script-source (~> 1.12)
+    jekyll-default-layout (0.1.5)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
+    jekyll-github-metadata (2.15.0)
       jekyll (>= 3.4, < 5.0)
       octokit (~> 4.0, != 4.4.0)
     jekyll-include-cache (0.2.1)
@@ -142,8 +92,8 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
       rubyzip (>= 1.3.0, < 3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
@@ -191,26 +141,76 @@ GEM
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.3)
       jekyll (>= 3.3, < 5.0)
+    jekyll-v4-github-pages (229)
+      github-pages-health-check (= 1.18.1)
+      jekyll (= 4.3.1)
+      jekyll-avatar (= 0.8.0)
+      jekyll-coffeescript (= 2.0.0)
+      jekyll-default-layout (= 0.1.5)
+      jekyll-feed (= 0.17.0)
+      jekyll-gist (= 1.5.0)
+      jekyll-github-metadata (= 2.15.0)
+      jekyll-include-cache (= 0.2.1)
+      jekyll-mentions (= 1.6.0)
+      jekyll-optional-front-matter (= 0.3.2)
+      jekyll-paginate (= 1.1.0)
+      jekyll-readme-index (= 0.3.0)
+      jekyll-redirect-from (= 0.16.0)
+      jekyll-relative-links (= 0.6.1)
+      jekyll-remote-theme (= 0.4.3)
+      jekyll-sass-converter (= 3.0.0)
+      jekyll-seo-tag (= 2.8.0)
+      jekyll-sitemap (= 1.4.0)
+      jekyll-swiss (= 1.0.0)
+      jekyll-theme-architect (= 0.2.0)
+      jekyll-theme-cayman (= 0.2.0)
+      jekyll-theme-dinky (= 0.2.0)
+      jekyll-theme-hacker (= 0.2.0)
+      jekyll-theme-leap-day (= 0.2.0)
+      jekyll-theme-merlot (= 0.2.0)
+      jekyll-theme-midnight (= 0.2.0)
+      jekyll-theme-minimal (= 0.2.0)
+      jekyll-theme-modernist (= 0.2.0)
+      jekyll-theme-primer (= 0.6.0)
+      jekyll-theme-slate (= 0.2.0)
+      jekyll-theme-tactile (= 0.2.0)
+      jekyll-theme-time-machine (= 0.2.0)
+      jekyll-titles-from-headings (= 0.5.3)
+      jekyll-v4-theme-primer (= 0.9.0)
+      jemoji (= 0.13.0)
+      kramdown (= 2.4.0)
+      kramdown-parser-gfm (= 1.1.0)
+      liquid (= 4.0.3)
+      mercenary (~> 0.3)
+      minima (= 2.5.1)
+      nokogiri (>= 1.13.6, < 2.0)
+      rouge (= 4.0.1)
+      terminal-table (~> 1.4)
+    jekyll-v4-theme-primer (0.9.0)
+      jekyll (>= 4.0, < 5.0)
+      jekyll-github-metadata (~> 2.9)
+      jekyll-sass-converter (~> 3.0)
+      jekyll-seo-tag (~> 2.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
+    jemoji (0.13.0)
+      gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
+    mercenary (0.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.16.3)
+    minitest (5.17.0)
     nokogiri (1.13.10-x86_64-darwin)
       racc (~> 1.4)
     octokit (4.25.1)
@@ -224,40 +224,34 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.0)
+    rouge (4.0.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-embedded (1.57.1-x86_64-darwin)
+      google-protobuf (~> 3.21)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     webrick (1.7.0)
-    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-darwin-21
 
 DEPENDENCIES
-  github-pages
-  webrick
+  jekyll-v4-github-pages
 
 BUNDLED WITH
    2.4.1
diff --git a/test_projects/mojombo/_expected/assets/css/style.css b/test_projects/mojombo/_expected/assets/css/style.css
diff --git a/test_projects/mojombo/_expected/assets/css/style.css.map b/test_projects/mojombo/_expected/assets/css/style.css.map
diff --git a/test_projects/octicons/_expected/assets/css/style.css b/test_projects/octicons/_expected/assets/css/style.css
diff --git a/test_projects/octicons/_expected/assets/css/style.css.map b/test_projects/octicons/_expected/assets/css/style.css.map