From 3618253d15d8258b152b311857a3d33203670c0b Mon Sep 17 00:00:00 2001
From: Matt Wang <matt@matthewwang.me>
Date: Mon, 22 May 2023 14:14:38 -0700
Subject: [PATCH] Fix CI installing multiple copies of Jekyll, explicitly add
 `kramdown-gfm-parser` to the `3.9` build (#1248)

See: https://github.com/just-the-docs/just-the-docs/pull/1112#issuecomment-1533518323.
---
 .github/workflows/ci.yml    | 18 +++++++++++++-----
 fixtures/Gemfile-jekyll-3.9 | 13 +++++++++++++
 fixtures/Gemfile-jekyll-4.3 |  9 +++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 fixtures/Gemfile-jekyll-3.9
 create mode 100644 fixtures/Gemfile-jekyll-4.3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 938a3ec..cef61b5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,14 +25,18 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: false
-    - name: Bundle Install
+    - name: Bundle Install (Jekyll ${{ matrix.jekyll-version }})
       run: bundle install
-    - name: Install Jekyll ${{ matrix.jekyll-version }}
-      run: gem install jekyll -v ${{ matrix.jekyll-version }}
+      env:
+        BUNDLE_GEMFILE: fixtures/Gemfile-jekyll-${{ matrix.jekyll-version }}
     - name: Init Search
       run: bundle exec rake search:init
+      env:
+        BUNDLE_GEMFILE: fixtures/Gemfile-jekyll-${{ matrix.jekyll-version }}
     - name: Build Site
       run: bundle exec jekyll build
+      env:
+        BUNDLE_GEMFILE: fixtures/Gemfile-jekyll-${{ matrix.jekyll-version }}
 
   github-pages-build:
     name: Build (github-pages gem)
@@ -45,9 +49,13 @@ jobs:
         ruby-version: '3.1'
         bundler-cache: false
     - name: Bundle Install
-      run: BUNDLE_GEMFILE=fixtures/Gemfile-github-pages bundle install
+      run: bundle install
+      env:
+        BUNDLE_GEMFILE: fixtures/Gemfile-github-pages
     - name: Build Site
-      run: BUNDLE_GEMFILE=fixtures/Gemfile-github-pages bundle exec jekyll build
+      run: bundle exec jekyll build
+      env:
+        BUNDLE_GEMFILE: fixtures/Gemfile-github-pages
 
   assets:
     name: Test CSS and JS
diff --git a/fixtures/Gemfile-jekyll-3.9 b/fixtures/Gemfile-jekyll-3.9
new file mode 100644
index 0000000..4e3af87
--- /dev/null
+++ b/fixtures/Gemfile-jekyll-3.9
@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+gem "jekyll", "~> 3.9"
+
+gem "jekyll-seo-tag", ">= 2.0"
+gem "rake", ">= 12.3.1"
+
+# required for Jekyll 3
+gem "webrick", "~> 1.7"
+gem "kramdown-parser-gfm", '~> 1.1'
+
+# docs-only
+gem "jekyll-github-metadata", ">= 2.15"
diff --git a/fixtures/Gemfile-jekyll-4.3 b/fixtures/Gemfile-jekyll-4.3
new file mode 100644
index 0000000..731a113
--- /dev/null
+++ b/fixtures/Gemfile-jekyll-4.3
@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gem "jekyll", "~> 4.3"
+
+gem "jekyll-seo-tag", ">= 2.0"
+gem "rake", ">= 12.3.1"
+
+# docs-only
+gem "jekyll-github-metadata", ">= 2.15"