From 96b2cf78c8a77b66c8d8b6f13976d800282b37d0 Mon Sep 17 00:00:00 2001 From: Will Cavanagh Date: Mon, 18 Oct 2021 11:44:24 -0700 Subject: [PATCH 1/3] Force Bundler version `1.17.2` to match Docker configuration --- .github/workflows/generate-preview.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/generate-preview.yml b/.github/workflows/generate-preview.yml index 84eff410c..c2f2bf8fd 100644 --- a/.github/workflows/generate-preview.yml +++ b/.github/workflows/generate-preview.yml @@ -21,6 +21,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 + bundler: 1.17.2 - name: Install Pandoc run: sudo apt-get install -y pandoc - name: Install Jekyll dependencies From 4c1c7164fe269e10892db22c5429c35f26d87254 Mon Sep 17 00:00:00 2001 From: Will Cavanagh Date: Mon, 18 Oct 2021 12:19:04 -0700 Subject: [PATCH 2/3] Add comment explaining forced bundler version --- .github/workflows/generate-preview.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/generate-preview.yml b/.github/workflows/generate-preview.yml index c2f2bf8fd..8668282fb 100644 --- a/.github/workflows/generate-preview.yml +++ b/.github/workflows/generate-preview.yml @@ -21,6 +21,9 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 + # Force bundler to 1.17.2 -- this matches the Dockerfile configuration + # but more importantly, using a newer bundler version seems to trigger + # a regression in the i18n of images. bundler: 1.17.2 - name: Install Pandoc run: sudo apt-get install -y pandoc From 856f49bc657c4448405de441fc7a610664280ca4 Mon Sep 17 00:00:00 2001 From: Will Cavanagh Date: Tue, 19 Oct 2021 14:22:42 -0700 Subject: [PATCH 3/3] Update publish workflow to use same Bundler revision, update comments --- .github/workflows/generate-preview.yml | 4 +--- .github/workflows/publish-docs.yml | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate-preview.yml b/.github/workflows/generate-preview.yml index 8668282fb..10510f193 100644 --- a/.github/workflows/generate-preview.yml +++ b/.github/workflows/generate-preview.yml @@ -21,9 +21,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 - # Force bundler to 1.17.2 -- this matches the Dockerfile configuration - # but more importantly, using a newer bundler version seems to trigger - # a regression in the i18n of images. + # Force bundler to 1.17.2 to match the Dockerfile configuration bundler: 1.17.2 - name: Install Pandoc run: sudo apt-get install -y pandoc diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index bb76a88e6..ae051d62e 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -24,6 +24,8 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 + # Force bundler to 1.17.2 to match the Dockerfile configuration + bundler: 1.17.2 - name: Install Pandoc run: sudo apt-get install -y pandoc - name: Install Jekyll dependencies