From cc3bb0a6cd2b288c5465c0d08ee51a2bfab00d58 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Thu, 3 Mar 2022 16:11:05 -0800 Subject: [PATCH 01/77] Pass the UNSAFE option to commonmark --- lib/github-pages/configuration.rb | 2 +- spec/github-pages/configuration_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/github-pages/configuration.rb b/lib/github-pages/configuration.rb index f1759a74..f4263e5b 100644 --- a/lib/github-pages/configuration.rb +++ b/lib/github-pages/configuration.rb @@ -153,7 +153,7 @@ def restrict_and_config_markdown_processor(config) config["markdown"] = "CommonMarkGhPages" config["commonmark"] = { "extensions" => %w(table strikethrough autolink tagfilter), - "options" => %w(footnotes), + "options" => %w(unsafe footnotes), } end diff --git a/spec/github-pages/configuration_spec.rb b/spec/github-pages/configuration_spec.rb index 36137e17..f9ced55a 100644 --- a/spec/github-pages/configuration_spec.rb +++ b/spec/github-pages/configuration_spec.rb @@ -83,7 +83,7 @@ expect(effective_config["markdown"]).to eql("CommonMarkGhPages") expect(effective_config["commonmark"]).to eql( "extensions" => %w(table strikethrough autolink tagfilter), - "options" => %w(footnotes) + "options" => %w(unsafe footnotes) ) end end From 8b58df6dc1e6d103e7e597e216a6410b3426aff6 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Thu, 3 Mar 2022 18:09:00 -0800 Subject: [PATCH 02/77] Bump :gem: to v225 --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index b40cc255..3def3caf 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 224 + VERSION = 225 end From e28d8587a1a8c3a9cafa42747ff66548492daf41 Mon Sep 17 00:00:00 2001 From: Hubot Date: Mon, 21 Mar 2022 02:51:14 -0700 Subject: [PATCH 03/77] Update kramdown to :gem: v2.3.2 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index ecaad659..45686ee3 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -11,7 +11,7 @@ class Dependencies "jekyll-sass-converter" => "1.5.2", # Converters - "kramdown" => "2.3.1", + "kramdown" => "2.3.2", "kramdown-parser-gfm" => "1.1.0", "jekyll-commonmark-ghpages" => "0.2.0", From 65869dbb8fceb270af8d9c20c44228dab0d80c72 Mon Sep 17 00:00:00 2001 From: ohdle Date: Tue, 12 Apr 2022 13:09:13 -0700 Subject: [PATCH 04/77] Require nokogiri 1.13.4 or greater --- github-pages.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github-pages.gemspec b/github-pages.gemspec index 1a9d5486..19feab40 100644 --- a/github-pages.gemspec +++ b/github-pages.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| end s.add_dependency("mercenary", "~> 0.3") - s.add_dependency("nokogiri", ">= 1.12.5", "< 2.0") + s.add_dependency("nokogiri", ">= 1.13.4", "< 2.0") s.add_dependency("terminal-table", "~> 1.4") s.add_development_dependency("jekyll_test_plugin_malicious", "~> 0.2") s.add_development_dependency("pry", "~> 0.10") From e0c079b21abb5feb6acec395c96299a8353582b0 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Mon, 18 Apr 2022 15:26:14 -0700 Subject: [PATCH 05/77] Bump jekyll to 3.9.2 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index ecaad659..77c5bdbb 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.9.0", + "jekyll" => "3.9.2", "jekyll-sass-converter" => "1.5.2", # Converters From fbcb6677257c35e7ca2b6730f2c0f02177a78dfe Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Mon, 18 Apr 2022 16:58:43 -0700 Subject: [PATCH 06/77] =?UTF-8?q?Bump=20=F0=9F=92=8E=20to=20v226?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index 3def3caf..be3a8fef 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 225 + VERSION = 226 end From 3208cd45bff5819922a3d80471564c01c51cc3a2 Mon Sep 17 00:00:00 2001 From: Simon Letort <367992+simonletort@users.noreply.github.com> Date: Wed, 22 Jun 2022 12:20:50 -0400 Subject: [PATCH 07/77] nokogiri >=1.13.6 --- github-pages.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github-pages.gemspec b/github-pages.gemspec index 19feab40..3602f4f8 100644 --- a/github-pages.gemspec +++ b/github-pages.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| end s.add_dependency("mercenary", "~> 0.3") - s.add_dependency("nokogiri", ">= 1.13.4", "< 2.0") + s.add_dependency("nokogiri", ">= 1.13.6", "< 2.0") s.add_dependency("terminal-table", "~> 1.4") s.add_development_dependency("jekyll_test_plugin_malicious", "~> 0.2") s.add_development_dependency("pry", "~> 0.10") From 26a8d155cfd57f8261f410b07f933f2a69644ec8 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 12 Jul 2022 10:01:30 -0700 Subject: [PATCH 08/77] Bump :gem: to v227 --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index be3a8fef..32a8ad38 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 226 + VERSION = 227 end From e70dc2860262bc43be02172dde070d1884785084 Mon Sep 17 00:00:00 2001 From: "James M. Greene" Date: Fri, 15 Jul 2022 11:29:04 -0500 Subject: [PATCH 09/77] Remove unused variable `CONFIGS_WITH_METHODS` --- lib/github-pages/configuration.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/github-pages/configuration.rb b/lib/github-pages/configuration.rb index f4263e5b..0d7ee434 100644 --- a/lib/github-pages/configuration.rb +++ b/lib/github-pages/configuration.rb @@ -62,13 +62,6 @@ class Configuration }, }.freeze - # These configuration settings have corresponding instance variables on - # Jekyll::Site and need to be set properly when the config is updated. - CONFIGS_WITH_METHODS = %w( - safe lsi highlighter baseurl exclude include future unpublished - show_drafts limit_posts keep_files - ).freeze - class << self def processed?(site) site.instance_variable_get(:@_github_pages_processed) == true From 659641205572f81e0fcf5af07fc8f61b33275575 Mon Sep 17 00:00:00 2001 From: "James M. Greene" Date: Fri, 13 Jan 2023 15:43:41 -0600 Subject: [PATCH 10/77] Add Dependabot config for Bundler and Actions usage --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..e9293605 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: + - package-ecosystem: "bundler" + directory: "/" + schedule: + interval: "weekly" + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From 2bc296af9fc17b282eef408f2ab2f7d2ebd8a398 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 00:53:52 +0000 Subject: [PATCH 11/77] Bump docker/metadata-action from 3 to 4 Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 3 to 4. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](https://github.com/docker/metadata-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 27a3982f..92794452 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -19,7 +19,7 @@ jobs: - name: Get Docker Metadata id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: ${{ env.DOCKER_TAG_IMAGE }} From d94c9860771e979be189856fb3547cb5c34c6e84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 00:53:57 +0000 Subject: [PATCH 12/77] Bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 27a3982f..5be3c46a 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Get Docker Metadata id: meta diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 80b0d2d1..f1948348 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -10,7 +10,7 @@ jobs: - 2.6 - 2.7 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - name: script/cibuild-docker run: script/cibuild-docker env: From 0ab2e265c94fb0422ef43b063092030a2ca5eb5d Mon Sep 17 00:00:00 2001 From: Grady Barrett Date: Thu, 12 Jan 2023 14:31:29 -0800 Subject: [PATCH 13/77] build: update liquid to 4.0.4 Ruby 3.2 removed the "tainted" interface, which liquid >=4.0.3 still uses. Liquid 4.0.4 removes references to this interface that it works with Ruby 3.2. Closes #859. --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 73e76717..29cfb191 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -16,7 +16,7 @@ class Dependencies "jekyll-commonmark-ghpages" => "0.2.0", # Misc - "liquid" => "4.0.3", + "liquid" => "4.0.4", "rouge" => "3.26.0", "github-pages-health-check" => "1.17.9", From 46b51cfeb1820fe49650f8b307ab413f9c606cb3 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Tue, 31 Jan 2023 13:17:41 +0500 Subject: [PATCH 14/77] Bump jekyll to v3.9.3 https://github.com/jekyll/jekyll/pull/9282 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 73e76717..6fe91a45 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.9.2", + "jekyll" => "3.9.3", "jekyll-sass-converter" => "1.5.2", # Converters From 9e968a7fe8e400b2435b298544c3150f40011886 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Tue, 31 Jan 2023 13:20:13 +0500 Subject: [PATCH 15/77] =?UTF-8?q?Bump=20=F0=9F=92=8E=20to=20v228?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index 32a8ad38..a38e8a6b 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 227 + VERSION = 228 end From be30930b60c198491498bfd53184be6a6d43a0d0 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 1 Feb 2023 13:56:20 -0800 Subject: [PATCH 16/77] Update jekyll-commonmark-ghpages --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 73e76717..830b0862 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -13,7 +13,7 @@ class Dependencies # Converters "kramdown" => "2.3.2", "kramdown-parser-gfm" => "1.1.0", - "jekyll-commonmark-ghpages" => "0.2.0", + "jekyll-commonmark-ghpages" => "0.4.0", # Misc "liquid" => "4.0.3", From 3874930877a84610ec20f11b57c1878277874aa1 Mon Sep 17 00:00:00 2001 From: Edward Ocampo-Gooding Date: Sun, 2 Apr 2023 10:41:27 -0400 Subject: [PATCH 17/77] Fixes `$github-pages health-check` NoMethodError --- bin/github-pages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/github-pages b/bin/github-pages index d91bf9d4..5ae512c9 100755 --- a/bin/github-pages +++ b/bin/github-pages @@ -43,7 +43,7 @@ Mercenary.program(:"github-pages") do |p| c.action do |args, options| require 'github-pages-health-check' cname_path = File.expand_path "CNAME", Dir.pwd - raise "No CNAME file found in current directory" unless File.exists?(cname_path) + raise "No CNAME file found in current directory" unless File.exist?(cname_path) cname = File.open(cname_path).read.strip check = GitHubPages::HealthCheck.check(cname) puts "Checking domain #{cname}..." From e3ebca2f19af41388882b7891cac8ef058170652 Mon Sep 17 00:00:00 2001 From: William Entriken Date: Sun, 23 Apr 2023 10:20:38 -0400 Subject: [PATCH 18/77] Support Ruby 3.2+, fixes #879 --- bin/github-pages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/github-pages b/bin/github-pages index d91bf9d4..5ae512c9 100755 --- a/bin/github-pages +++ b/bin/github-pages @@ -43,7 +43,7 @@ Mercenary.program(:"github-pages") do |p| c.action do |args, options| require 'github-pages-health-check' cname_path = File.expand_path "CNAME", Dir.pwd - raise "No CNAME file found in current directory" unless File.exists?(cname_path) + raise "No CNAME file found in current directory" unless File.exist?(cname_path) cname = File.open(cname_path).read.strip check = GitHubPages::HealthCheck.check(cname) puts "Checking domain #{cname}..." From dc927fab41bf56d028cd3b07991765ec03b16456 Mon Sep 17 00:00:00 2001 From: Tobias Bielohlawek Date: Wed, 21 Jun 2023 15:42:45 +0200 Subject: [PATCH 19/77] Enable multi arch docker image build I figured the docker image is only build for amd64 architectures. With this change, multi arch is enabled by using the official docker build actions for docker login, build & push. --- .github/workflows/publish-docker.yml | 32 +++++++++++++++++----------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 2e145347..67ca428e 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -7,7 +7,7 @@ on: branches: [ master ] env: - DOCKER_TAG_IMAGE: "ghcr.io/github/pages-gem" + REGISTRY: ghcr.io jobs: build: @@ -17,19 +17,27 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to the Container registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Get Docker Metadata id: meta uses: docker/metadata-action@v4 with: - images: ${{ env.DOCKER_TAG_IMAGE }} - - - name: Build Docker Image - run: | - docker build -t ${{ steps.meta.outputs.tags }} -f Dockerfile . - - - name: Push to Container Registry - if: github.event_name != 'pull_request' - run: | - echo ${{ secrets.GITHUB_TOKEN }} | docker login -u ${{ github.actor }} https://ghcr.io --password-stdin - docker push ${{ steps.meta.outputs.tags }} + images: ${{ env.REGISTRY }}/${{ github.repository }} + - name: Build Docker Image and Push to Container Registry + uses: docker/build-push-action@v4 + with: + context: . + push: ${{ github.event_name != 'pull_request' }} + platforms: linux/amd64,linux/arm64 + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 95375ce1c4d0d6ca82b0861a25cd080aaa7047ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 18:32:13 +0000 Subject: [PATCH 20/77] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 2e145347..c05fc8c8 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get Docker Metadata id: meta diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f1948348..8ebfb0cb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -10,7 +10,7 @@ jobs: - 2.6 - 2.7 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: script/cibuild-docker run: script/cibuild-docker env: From ec38f425d941acadb0ff48ddf55b168634c48889 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 18:10:26 +0000 Subject: [PATCH 21/77] Bump docker/metadata-action from 4 to 5 Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](https://github.com/docker/metadata-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 2e145347..6ed50282 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -19,7 +19,7 @@ jobs: - name: Get Docker Metadata id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.DOCKER_TAG_IMAGE }} From f3ee583a93b0d9f47388c8619dc7baf8475c5f85 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 13:11:11 -0600 Subject: [PATCH 22/77] Create publish-gem.yml --- .github/workflows/publish-gem.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/publish-gem.yml diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml new file mode 100644 index 00000000..c2e0a053 --- /dev/null +++ b/.github/workflows/publish-gem.yml @@ -0,0 +1,21 @@ +name: Publish Gem + +on: + push: + tags: + - '*' + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + - name: Build gem + run: | + gem build github-pages.gemspec + - name: Publish + run: | + gem push github-pages.gem --key ${{ secrets.PAGES_GEM_PUBLISH }} From bb1d50ebb6fe0be69bd55ebd545019837c3b83d5 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 13:12:46 -0600 Subject: [PATCH 23/77] add ruby version --- .github/workflows/publish-gem.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index c2e0a053..3c4d7293 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -13,6 +13,8 @@ jobs: uses: actions/checkout@v3 - name: Setup Ruby uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.2' - name: Build gem run: | gem build github-pages.gemspec From ecb7a8aa9d63ce238035e60abf4446c6ed446c86 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 13:19:34 -0600 Subject: [PATCH 24/77] Update publish-gem.yml --- .github/workflows/publish-gem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 3c4d7293..d7eca5b9 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.2' + ruby-version: '2.7.3' - name: Build gem run: | gem build github-pages.gemspec From 31bce95c151021f8d0584605b72a7b59d7c0d764 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 13:25:37 -0600 Subject: [PATCH 25/77] Update publish-gem.yml --- .github/workflows/publish-gem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index d7eca5b9..3c4d7293 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7.3' + ruby-version: '3.2' - name: Build gem run: | gem build github-pages.gemspec From 2d66a27538bf078b71a92f23fb0a34ac7afb498a Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 15:32:50 -0600 Subject: [PATCH 26/77] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b84ef29..e92e0a4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=2.7.3 +ARG RUBY_VERSION=3.2 FROM ruby:$RUBY_VERSION RUN apt-get update \ From 351e4a73908fdc37c6eadf2d481e02a58287783f Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 15:34:18 -0600 Subject: [PATCH 27/77] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e92e0a4d..6b84ef29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.2 +ARG RUBY_VERSION=2.7.3 FROM ruby:$RUBY_VERSION RUN apt-get update \ From 8c97daf600f63d3690bef0f15747f9d2ec230031 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 15:34:34 -0600 Subject: [PATCH 28/77] Update publish-gem.yml --- .github/workflows/publish-gem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 3c4d7293..d7eca5b9 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.2' + ruby-version: '2.7.3' - name: Build gem run: | gem build github-pages.gemspec From 733764923ecf6edfe8d5c15bed7fb1aca97512b4 Mon Sep 17 00:00:00 2001 From: yimysty Date: Tue, 2 Jan 2024 13:45:43 -0800 Subject: [PATCH 29/77] update gem update --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b84ef29..e15924a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ RUN apt-get update \ make \ nodejs -RUN gem update --system +# final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 +RUN gem update --system 3.4.22 COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ From 549fa797a8ee06a5a2075d9f4eefa91054ccf8fa Mon Sep 17 00:00:00 2001 From: yimysty Date: Tue, 2 Jan 2024 13:48:44 -0800 Subject: [PATCH 30/77] upgrade to 2.7.8 --- .github/workflows/publish-gem.yml | 2 +- .ruby-version | 2 +- Dockerfile | 2 +- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index d7eca5b9..4826e637 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7.3' + ruby-version: '2.7.8' - name: Build gem run: | gem build github-pages.gemspec diff --git a/.ruby-version b/.ruby-version index 2c9b4ef4..6a81b4c8 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.3 +2.7.8 diff --git a/Dockerfile b/Dockerfile index e15924a3..b7a20d34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=2.7.3 +ARG RUBY_VERSION=2.7.8 FROM ruby:$RUBY_VERSION RUN apt-get update \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 3c572c2f..d624ff80 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:2.7.3-alpine +FROM ruby:2.7.8-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 7a6ca87d..2a02658a 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="2.7.3"}" +: "${RUBY_VERSION:="2.7.8"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From d7615e1cfee4b3632422daffbd0cbff6a965cbca Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Tue, 2 Jan 2024 16:03:19 -0600 Subject: [PATCH 31/77] Update publish-gem.yml --- .github/workflows/publish-gem.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 4826e637..e48c355d 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -1,9 +1,8 @@ name: Publish Gem on: - push: - tags: - - '*' + release: + types: [released] jobs: release: From a1e407c1f7d6466cdf4d1191e992377be2d2fefa Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 16:46:49 -0600 Subject: [PATCH 32/77] change ruby version --- .github/workflows/publish-gem.yml | 2 +- .ruby-version | 2 +- Dockerfile | 4 ++-- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index e48c355d..0ae06f3f 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7.8' + ruby-version: "3.2" - name: Build gem run: | gem build github-pages.gemspec diff --git a/.ruby-version b/.ruby-version index 6a81b4c8..a3ec5a4b 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.2 diff --git a/Dockerfile b/Dockerfile index b7a20d34..43e0bb02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=2.7.8 +ARG RUBY_VERSION=3.2 FROM ruby:$RUBY_VERSION RUN apt-get update \ @@ -9,7 +9,7 @@ RUN apt-get update \ nodejs # final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 -RUN gem update --system 3.4.22 +RUN gem update --system COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index d624ff80..d3c4eccf 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:2.7.8-alpine +FROM ruby:3.2-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 2a02658a..2ba771ab 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="2.7.8"}" +: "${RUBY_VERSION:="3.2"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 3980c1a55497763355c6bef2ac330657fed95fb4 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 16:50:15 -0600 Subject: [PATCH 33/77] add version to update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 43e0bb02..45d58c6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update \ nodejs # final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 -RUN gem update --system +RUN gem update --system 3.2 COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ From 90b989b2131f2c012516677d49a64c97143dc50c Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 16:52:03 -0600 Subject: [PATCH 34/77] revert to working update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45d58c6d..42ed7c0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update \ nodejs # final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 -RUN gem update --system 3.2 +RUN gem update --system 3.4.22 COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ From 7c86cdb4a8e6c072ec9d1ef0c6dd2201e69e562e Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 17:02:07 -0600 Subject: [PATCH 35/77] add 3.2 --- .github/workflows/push.yml | 1 + .travis.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 8ebfb0cb..aacec0fe 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -9,6 +9,7 @@ jobs: ruby: - 2.6 - 2.7 + - 3.2 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.travis.yml b/.travis.yml index 1b620224..a54af907 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 2.5 - 2.6 - 2.7 + - 3.2 branches: only: From d73437f8839d26229db356a7fd1bc8dd9d31de34 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Wed, 3 Jan 2024 17:12:00 -0600 Subject: [PATCH 36/77] remove 2.6 --- .github/workflows/push.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index aacec0fe..eac75798 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,9 +7,11 @@ jobs: strategy: matrix: ruby: - - 2.6 - 2.7 + - 3.0 + - 3.1 - 3.2 + - 3.3 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker From 9ccadb72b949e52608ed83bb3a5ba0cd2fc4333a Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Thu, 4 Jan 2024 11:06:54 -0600 Subject: [PATCH 37/77] Update push.yml --- .github/workflows/push.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index eac75798..82294647 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,11 +7,9 @@ jobs: strategy: matrix: ruby: - - 2.7 - 3.0 - 3.1 - 3.2 - - 3.3 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker From 8dd7a8027531c3a83d959196ecd67096e327d731 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Thu, 4 Jan 2024 11:12:47 -0600 Subject: [PATCH 38/77] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a54af907..a2bf57df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ rvm: - 2.5 - 2.6 - 2.7 + - 3.0 + - 3.1 - 3.2 branches: From 48da3d252487069e88a22370b6818882c15a7e1f Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 11:26:51 -0600 Subject: [PATCH 39/77] test 3.4 for CI --- .github/workflows/publish-gem.yml | 2 +- .github/workflows/push.yml | 3 +-- .ruby-version | 2 +- .travis.yml | 6 +----- Dockerfile | 2 +- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 0ae06f3f..57de3a52 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.2" + ruby-version: "3.4" - name: Build gem run: | gem build github-pages.gemspec diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 82294647..5a8eea22 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,8 +8,7 @@ jobs: matrix: ruby: - 3.0 - - 3.1 - - 3.2 + - 3.4.22 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.ruby-version b/.ruby-version index a3ec5a4b..ffbf6d87 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2 +3.4.22 diff --git a/.travis.yml b/.travis.yml index a2bf57df..236ea7a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,7 @@ language: ruby rvm: - - 2.5 - - 2.6 - - 2.7 - 3.0 - - 3.1 - - 3.2 + - 3.4.22 branches: only: diff --git a/Dockerfile b/Dockerfile index 42ed7c0b..873595ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.2 +ARG RUBY_VERSION=3.4.22 FROM ruby:$RUBY_VERSION RUN apt-get update \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index d3c4eccf..edaa0640 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:3.2-alpine +FROM ruby:3.4.22-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 2ba771ab..8bae686f 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="3.2"}" +: "${RUBY_VERSION:="3.4.22"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 460897fdf92b1c7cc98762357fbf3d29d18001c1 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 11:28:53 -0600 Subject: [PATCH 40/77] update version --- .github/workflows/push.yml | 2 +- .ruby-version | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 5a8eea22..644e51f8 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,7 +8,7 @@ jobs: matrix: ruby: - 3.0 - - 3.4.22 + - 3.4 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.ruby-version b/.ruby-version index ffbf6d87..2f4b6075 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4.22 +3.4 diff --git a/.travis.yml b/.travis.yml index 236ea7a4..339a167a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: - 3.0 - - 3.4.22 + - 3.4 branches: only: diff --git a/Dockerfile b/Dockerfile index 873595ec..0e647ba9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.4.22 +ARG RUBY_VERSION=3.4 FROM ruby:$RUBY_VERSION RUN apt-get update \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index edaa0640..ec5a2fe3 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:3.4.22-alpine +FROM ruby:3.4-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 8bae686f..2e95c5bb 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="3.4.22"}" +: "${RUBY_VERSION:="3.4"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 798d7780b1898b6c9ab16056f7d51a02c0d37ed2 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 11:32:02 -0600 Subject: [PATCH 41/77] update --- .github/workflows/publish-gem.yml | 2 +- .github/workflows/push.yml | 2 +- .ruby-version | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- Dockerfile.alpine | 2 +- script/cibuild-docker | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 57de3a52..9ece656d 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.4" + ruby-version: "3.3" - name: Build gem run: | gem build github-pages.gemspec diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 644e51f8..2f6987d5 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,7 +8,7 @@ jobs: matrix: ruby: - 3.0 - - 3.4 + - 3.3 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.ruby-version b/.ruby-version index 2f4b6075..eb39e538 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.4 +3.3 diff --git a/.travis.yml b/.travis.yml index 339a167a..449bd734 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: - 3.0 - - 3.4 + - 3.3 branches: only: diff --git a/Dockerfile b/Dockerfile index 0e647ba9..cd81f2d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.4 +ARG RUBY_VERSION=3.3 FROM ruby:$RUBY_VERSION RUN apt-get update \ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index ec5a2fe3..aea69e92 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM ruby:3.4-alpine +FROM ruby:3.3-alpine RUN apk update && apk add --no-cache \ git diff --git a/script/cibuild-docker b/script/cibuild-docker index 2e95c5bb..6b1c91f0 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -3,7 +3,7 @@ set -ex # Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="3.4"}" +: "${RUBY_VERSION:="3.3"}" docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From fa1b540f818f3fe4f33d8e82e53f22b93d895c67 Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 18:18:41 -0600 Subject: [PATCH 42/77] change ruby version --- .github/workflows/push.yml | 4 ++-- .travis.yml | 21 --------------------- Dockerfile | 2 +- script/cibuild-docker | 5 +---- 4 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2f6987d5..ffb1ee7f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,8 +7,8 @@ jobs: strategy: matrix: ruby: - - 3.0 - - 3.3 + - '3.0' + - '3.3' steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 449bd734..00000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: ruby -rvm: - - 3.0 - - 3.3 - -branches: - only: - - master - -before_install: - - gem update --system - - gem install bundler -script: "script/cibuild" -env: - global: - - NOKOGIRI_USE_SYSTEM_LIBRARIES=true - -notifications: - email: false - -cache: bundler diff --git a/Dockerfile b/Dockerfile index cd81f2d9..f0746a25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update \ nodejs # final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 -RUN gem update --system 3.4.22 +RUN gem update --system COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ diff --git a/script/cibuild-docker b/script/cibuild-docker index 6b1c91f0..903baa53 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -2,8 +2,5 @@ set -ex -# Set the ruby version in the Action definition matrix. -: "${RUBY_VERSION:="3.3"}" - -docker build --build-arg "RUBY_VERSION=$RUBY_VERSION" -t github-pages . +docker build --build-arg -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 117fd758cf947bd30652c2a6bf29b7588b06a2cf Mon Sep 17 00:00:00 2001 From: tsusdere Date: Thu, 4 Jan 2024 18:20:19 -0600 Subject: [PATCH 43/77] update jekyll --- lib/github-pages/dependencies.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index dba5cc26..ad782395 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.9.3", + "jekyll" => "3.9.4", "jekyll-sass-converter" => "1.5.2", # Converters @@ -63,7 +63,7 @@ def self.version_report require "nokogiri" { - "ruby" => RUBY_VERSION, + "ruby" => "3.3", # Gem versions we're curious about "github-pages" => VERSION.to_s, From ed0d437542a055630c9c0279098b1cf411d9af2f Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Thu, 4 Jan 2024 18:21:53 -0600 Subject: [PATCH 44/77] Update cibuild-docker --- script/cibuild-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild-docker b/script/cibuild-docker index 903baa53..374ac15e 100755 --- a/script/cibuild-docker +++ b/script/cibuild-docker @@ -2,5 +2,5 @@ set -ex -docker build --build-arg -t github-pages . +docker build -t github-pages . docker run --rm --workdir /src/gh/pages-gem github-pages script/cibuild From 91e261dcb8c3afe822ef570bb4f688e8b04cf779 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Thu, 4 Jan 2024 18:27:43 -0600 Subject: [PATCH 45/77] Update .rubocop.yml --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index fbcea5f9..9cbf940c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -23,7 +23,7 @@ require: - rubocop-performance AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 3.0 Exclude: - 'bin/**/*' - 'script/**/*' From c31c982b78976a197dfe34c5ca76a9d127058cbc Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Fri, 5 Jan 2024 12:37:02 -0600 Subject: [PATCH 46/77] Update github-pages.gemspec --- github-pages.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github-pages.gemspec b/github-pages.gemspec index 3602f4f8..dacbb09f 100644 --- a/github-pages.gemspec +++ b/github-pages.gemspec @@ -30,5 +30,5 @@ Gem::Specification.new do |s| s.add_development_dependency("jekyll_test_plugin_malicious", "~> 0.2") s.add_development_dependency("pry", "~> 0.10") s.add_development_dependency("rspec", "~> 3.3") - s.add_development_dependency("rubocop-github", "0.16.0") + s.add_development_dependency("rubocop-github", "0.20.0") end From 47322fd2c858bdab9ca79869540b972e530d9c71 Mon Sep 17 00:00:00 2001 From: Fabian Aguilar Gomez Date: Fri, 5 Jan 2024 12:39:19 -0600 Subject: [PATCH 47/77] Update Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 464ed458..31363899 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gemspec gem "jekyll-octicons" group :test do - gem "rubocop", "~> 0.79" + gem "rubocop", "~> 1.37" gem "rubocop-performance" gem "webmock" end From efb24c90be289fa1d2f63057cdc646ecb205c399 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 18:10:26 +0000 Subject: [PATCH 48/77] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-gem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 9ece656d..471c074a 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: From 29e529b537a091403930671f3a4fd7acc597d550 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Mon, 5 Feb 2024 21:05:52 -0800 Subject: [PATCH 49/77] Bring back proper support for Docker 3.x --- .github/workflows/push.yml | 6 ++++-- Dockerfile | 3 --- lib/github-pages/dependencies.rb | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ffb1ee7f..847bb76c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,8 +7,10 @@ jobs: strategy: matrix: ruby: - - '3.0' - - '3.3' + - 3.0 + - 3.1 + - 3.2 + - 3.3 steps: - uses: actions/checkout@v4 - name: script/cibuild-docker diff --git a/Dockerfile b/Dockerfile index f0746a25..3caedbfe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,6 @@ RUN apt-get update \ make \ nodejs -# final version for rubygems-update to supoprt ruby 2.7, consider removing this after upgraded to ruby 3.0 -RUN gem update --system - COPY .git /src/gh/pages-gem/.git COPY Gemfile* /src/gh/pages-gem/ COPY github-pages.gemspec /src/gh/pages-gem diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index ad782395..bf41272b 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -63,7 +63,7 @@ def self.version_report require "nokogiri" { - "ruby" => "3.3", + "ruby" => RUBY_VERSION, # Gem versions we're curious about "github-pages" => VERSION.to_s, From 9a20094dda4a7a99fbb7900b0c66fc558cd32319 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Feb 2024 09:46:37 -0800 Subject: [PATCH 50/77] Update .github/workflows/push.yml --- .github/workflows/push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 847bb76c..84143356 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,10 +7,10 @@ jobs: strategy: matrix: ruby: - - 3.0 - - 3.1 - - 3.2 - - 3.3 + - '3.0' + - '3.1' + - '3.2' + - '3.3' steps: - uses: actions/checkout@v4 - name: script/cibuild-docker From 2507b281f67384bd32ef81a3e803667e61ed506a Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Feb 2024 10:52:58 -0800 Subject: [PATCH 51/77] Bump dependencies (patch and minor only) --- lib/github-pages/dependencies.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index bf41272b..10a56735 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -11,35 +11,35 @@ class Dependencies "jekyll-sass-converter" => "1.5.2", # Converters - "kramdown" => "2.3.2", + "kramdown" => "2.4.0", "kramdown-parser-gfm" => "1.1.0", "jekyll-commonmark-ghpages" => "0.4.0", # Misc "liquid" => "4.0.4", - "rouge" => "3.26.0", - "github-pages-health-check" => "1.17.9", + "rouge" => "3.30.0", + "github-pages-health-check" => "1.18.2", # Plugins "jekyll-redirect-from" => "0.16.0", "jekyll-sitemap" => "1.4.0", - "jekyll-feed" => "0.15.1", - "jekyll-gist" => "1.5.0", + "jekyll-feed" => "0.17.0", + "jekyll-gist" => "1.6.0", "jekyll-paginate" => "1.1.0", - "jekyll-coffeescript" => "1.1.1", + "jekyll-coffeescript" => "1.2.2", "jekyll-seo-tag" => "2.8.0", - "jekyll-github-metadata" => "2.13.0", - "jekyll-avatar" => "0.7.0", + "jekyll-github-metadata" => "2.16.1", + "jekyll-avatar" => "0.8.0", "jekyll-remote-theme" => "0.4.3", "jekyll-include-cache" => "0.2.1", # Plugins to match GitHub.com Markdown - "jemoji" => "0.12.0", + "jemoji" => "0.13.0", "jekyll-mentions" => "1.6.0", - "jekyll-relative-links" => "0.6.1", + "jekyll-relative-links" => "0.7.0", "jekyll-optional-front-matter" => "0.3.2", "jekyll-readme-index" => "0.3.0", - "jekyll-default-layout" => "0.1.4", + "jekyll-default-layout" => "0.1.5", "jekyll-titles-from-headings" => "0.5.3", }.freeze From 7078757805bf40a6f7c1f31cdbae7b37dafae04b Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Feb 2024 10:54:24 -0800 Subject: [PATCH 52/77] Update lib/github-pages/dependencies.rb --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 10a56735..048b3131 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -24,7 +24,7 @@ class Dependencies "jekyll-redirect-from" => "0.16.0", "jekyll-sitemap" => "1.4.0", "jekyll-feed" => "0.17.0", - "jekyll-gist" => "1.6.0", + "jekyll-gist" => "1.5.0", "jekyll-paginate" => "1.1.0", "jekyll-coffeescript" => "1.2.2", "jekyll-seo-tag" => "2.8.0", From ae1534fe8139e849fec791c693b918663070a74c Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Feb 2024 13:02:22 -0800 Subject: [PATCH 53/77] Prep 229 --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index a38e8a6b..65006ca1 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 228 + VERSION = 229 end From 16411802f0074ae8407178c82cf850e27d247cfc Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Feb 2024 14:31:03 -0800 Subject: [PATCH 54/77] Fix release script --- .github/workflows/publish-gem.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 471c074a..8aa32fbf 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -17,6 +17,6 @@ jobs: - name: Build gem run: | gem build github-pages.gemspec - - name: Publish + - name: Publish gem run: | - gem push github-pages.gem --key ${{ secrets.PAGES_GEM_PUBLISH }} + gem push github-pages-*.gem --key ${{ secrets.PAGES_GEM_PUBLISH }} From ab40e56b0e6e17c56f6e3c0e9e456d30f0018239 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Feb 2024 14:48:40 -0800 Subject: [PATCH 55/77] Another publish script fix --- .github/workflows/publish-gem.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 8aa32fbf..1f9a37a0 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -18,5 +18,7 @@ jobs: run: | gem build github-pages.gemspec - name: Publish gem + env: + GEM_HOST_API_KEY: ${{ secrets.PAGES_GEM_PUBLISH }} run: | - gem push github-pages-*.gem --key ${{ secrets.PAGES_GEM_PUBLISH }} + gem push github-pages-*.gem From cce7dec390573d3fc527e21af91f3a6faaf6bbf6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 18:41:44 +0000 Subject: [PATCH 56/77] Bump docker/build-push-action from 4 to 5 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index e08a2c4f..46e3a4d2 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -34,7 +34,7 @@ jobs: images: ${{ env.REGISTRY }}/${{ github.repository }} - name: Build Docker Image and Push to Container Registry - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . push: ${{ github.event_name != 'pull_request' }} From fec2d294967acf006ab382fffcc5fa15640a291f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 18:41:46 +0000 Subject: [PATCH 57/77] Bump docker/setup-buildx-action from 2 to 3 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index e08a2c4f..38e310d9 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Log in to the Container registry uses: docker/login-action@v2 From 3bb7e261c6c97faa537717b1d7ad81f0ecc70ca8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 18:41:48 +0000 Subject: [PATCH 58/77] Bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index e08a2c4f..0db3d358 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -21,7 +21,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Log in to the Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} From ec909f7e7ed1e97edf38c5bdd3227ec93f95de29 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Mon, 12 Feb 2024 22:08:18 -0800 Subject: [PATCH 59/77] Bump Jekyll to 3.9.5 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 048b3131..bf0d455d 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.9.4", + "jekyll" => "3.9.5", "jekyll-sass-converter" => "1.5.2", # Converters From e7a03e729a37d7477ca79237318d568b4f1003e3 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Mon, 12 Feb 2024 22:27:41 -0800 Subject: [PATCH 60/77] Also prep release --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index 65006ca1..1d4d3c97 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 229 + VERSION = 230 end From c29f89c3c13c55cfc4aec49d58089a58c123e980 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 13 Feb 2024 16:10:40 -0800 Subject: [PATCH 61/77] Revert jekyll-relative-links to 0.6.1 and add a test --- lib/github-pages/dependencies.rb | 2 +- lib/github-pages/version.rb | 2 +- spec/fixtures/jekyll-relative-links.md | 4 +++- spec/github-pages/integration_spec.rb | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index bf0d455d..5d3f948d 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -36,7 +36,7 @@ class Dependencies # Plugins to match GitHub.com Markdown "jemoji" => "0.13.0", "jekyll-mentions" => "1.6.0", - "jekyll-relative-links" => "0.7.0", + "jekyll-relative-links" => "0.6.1", "jekyll-optional-front-matter" => "0.3.2", "jekyll-readme-index" => "0.3.0", "jekyll-default-layout" => "0.1.5", diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index 1d4d3c97..c69e2cda 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 230 + VERSION = 231 end diff --git a/spec/fixtures/jekyll-relative-links.md b/spec/fixtures/jekyll-relative-links.md index 889348d1..bebe8a23 100644 --- a/spec/fixtures/jekyll-relative-links.md +++ b/spec/fixtures/jekyll-relative-links.md @@ -1,5 +1,7 @@ --- +excerpt: Just a relative link --- - [Jekyll](jekyll.md) + +{{ page.excerpt }} \ No newline at end of file diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb index 35740df2..5b3da4bf 100644 --- a/spec/github-pages/integration_spec.rb +++ b/spec/github-pages/integration_spec.rb @@ -224,6 +224,7 @@ def rm_destination context "jekyll-relative-links" do it "converts relative links" do expect(contents).to match('Jekyll') + expect(contents).to match('

Just a relative link

') # excerpt end end From dcd2f8ec6d56bbb314cf8fbe18bbe210baf703f1 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 13 Feb 2024 16:13:35 -0800 Subject: [PATCH 62/77] =?UTF-8?q?Ok=20=F0=9F=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spec/github-pages/integration_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb index 5b3da4bf..d673a418 100644 --- a/spec/github-pages/integration_spec.rb +++ b/spec/github-pages/integration_spec.rb @@ -224,7 +224,7 @@ def rm_destination context "jekyll-relative-links" do it "converts relative links" do expect(contents).to match('Jekyll') - expect(contents).to match('

Just a relative link

') # excerpt + expect(contents).to match("

Just a relative link

") # excerpt end end From 217824028524d9a8759bf46f53c379acf615621d Mon Sep 17 00:00:00 2001 From: Ignacio Tolstoy Date: Thu, 22 Feb 2024 12:43:38 +0100 Subject: [PATCH 63/77] Update nokogiri CVE-2024-25062 --- github-pages.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github-pages.gemspec b/github-pages.gemspec index dacbb09f..9d9594b7 100644 --- a/github-pages.gemspec +++ b/github-pages.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| end s.add_dependency("mercenary", "~> 0.3") - s.add_dependency("nokogiri", ">= 1.13.6", "< 2.0") + s.add_dependency("nokogiri", ">= 1.16.2", "< 2.0") s.add_dependency("terminal-table", "~> 1.4") s.add_development_dependency("jekyll_test_plugin_malicious", "~> 0.2") s.add_development_dependency("pry", "~> 0.10") From 7292abd8578ba14004e22fa153bf02ab9a4c9173 Mon Sep 17 00:00:00 2001 From: Mark Crossfield Date: Fri, 1 Mar 2024 19:26:55 +0000 Subject: [PATCH 64/77] Avoid Gemfile from site hiding installed gems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I’ve specified the BUNDLE_GEMFILE as the one that exists in the /src/site location (the source of the site being built) was preventing Jekyll from finding the installed dependencies. --- Dockerfile | 2 ++ Dockerfile.alpine | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 3caedbfe..6fe6a8df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,8 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 ENV LC_ALL en_US.UTF-8 +ENV BUNDLE_GEMFILE=/src/gh/pages-gem/Gemfile + WORKDIR /src/site CMD ["jekyll", "serve", "-H", "0.0.0.0", "-P", "4000"] diff --git a/Dockerfile.alpine b/Dockerfile.alpine index aea69e92..717b1b8e 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -17,6 +17,8 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 ENV LC_ALL en_US.UTF-8 +ENV BUNDLE_GEMFILE=/src/gh/pages-gem/Gemfile + WORKDIR /src/site CMD ["jekyll", "serve", "-H", "0.0.0.0", "-P", "4000"] From 40126625429c877fc8a0d82b62332ca9e0e4cab6 Mon Sep 17 00:00:00 2001 From: Mark Crossfield Date: Fri, 1 Mar 2024 19:28:02 +0000 Subject: [PATCH 65/77] =?UTF-8?q?Add=20webrick=20as=20Ruby=203=20doesn?= =?UTF-8?q?=E2=80=99t=20include=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This may be fixable by upgrading Jekyll as it is now declared as a dependency. --- lib/github-pages/dependencies.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 5d3f948d..2da2c956 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -9,6 +9,7 @@ class Dependencies # Jekyll "jekyll" => "3.9.5", "jekyll-sass-converter" => "1.5.2", + "webrick" => "1.8.1", # Converters "kramdown" => "2.4.0", From 8c298f22000a2829919ee57744fe29f07857fe5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 18:32:41 +0000 Subject: [PATCH 66/77] Bump docker/build-push-action from 5 to 6 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5...v6) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 2c2f50c4..028879a8 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -34,7 +34,7 @@ jobs: images: ${{ env.REGISTRY }}/${{ github.repository }} - name: Build Docker Image and Push to Container Registry - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: ${{ github.event_name != 'pull_request' }} From 0d32533cb9c8bbd4ccdb832cd63790b368eb36c6 Mon Sep 17 00:00:00 2001 From: Parker Moore <237985+parkr@users.noreply.github.com> Date: Mon, 24 Jun 2024 15:33:32 -0700 Subject: [PATCH 67/77] Upgrade to Jekyll 3.10.0 No functionality is changed. Since Ruby 3.0 dropped webrick and Ruby 3.4 is going to drop csv, this adds them back as dependencies. https://jekyllrb.com/news/2024/06/23/jekyll-3-10-0-released/ --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 2da2c956..76607aeb 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.9.5", + "jekyll" => "3.10.0", "jekyll-sass-converter" => "1.5.2", "webrick" => "1.8.1", From f94a6468037ec955b9d098b13d53973d0a03111d Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:22:19 -0700 Subject: [PATCH 68/77] bump jekyll-commonmark-ghpages --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 76607aeb..8a21e7b9 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -14,7 +14,7 @@ class Dependencies # Converters "kramdown" => "2.4.0", "kramdown-parser-gfm" => "1.1.0", - "jekyll-commonmark-ghpages" => "0.4.0", + "jekyll-commonmark-ghpages" => "0.5.0", # Misc "liquid" => "4.0.4", From 3ecc50f8b97df882d786a15c5fa543699f68ea89 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:34:55 -0700 Subject: [PATCH 69/77] Update lib/github-pages/dependencies.rb --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 8a21e7b9..f131b29a 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -14,7 +14,7 @@ class Dependencies # Converters "kramdown" => "2.4.0", "kramdown-parser-gfm" => "1.1.0", - "jekyll-commonmark-ghpages" => "0.5.0", + "jekyll-commonmark-ghpages" => "0.5.1", # Misc "liquid" => "4.0.4", From 7b839b231b0a8e753951ebb370bd1ad184281e85 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:47:06 -0700 Subject: [PATCH 70/77] Add webrick to core --- spec/github-pages/dependencies_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/github-pages/dependencies_spec.rb b/spec/github-pages/dependencies_spec.rb index 619e9739..574ec14d 100644 --- a/spec/github-pages/dependencies_spec.rb +++ b/spec/github-pages/dependencies_spec.rb @@ -5,7 +5,7 @@ describe(GitHubPages::Dependencies) do CORE_DEPENDENCIES = %w( jekyll kramdown kramdown-parser-gfm liquid rouge jekyll-sass-converter - github-pages-health-check + github-pages-health-check webrick ).freeze PLUGINS = described_class::VERSIONS.keys - CORE_DEPENDENCIES From 48dca23c8ce904c9235ef38915ad067f43cc24ff Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:47:49 -0700 Subject: [PATCH 71/77] cosmetic --- spec/github-pages/dependencies_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/github-pages/dependencies_spec.rb b/spec/github-pages/dependencies_spec.rb index 574ec14d..b0248e90 100644 --- a/spec/github-pages/dependencies_spec.rb +++ b/spec/github-pages/dependencies_spec.rb @@ -5,7 +5,8 @@ describe(GitHubPages::Dependencies) do CORE_DEPENDENCIES = %w( jekyll kramdown kramdown-parser-gfm liquid rouge jekyll-sass-converter - github-pages-health-check webrick + github-pages-health-check + webrick ).freeze PLUGINS = described_class::VERSIONS.keys - CORE_DEPENDENCIES From f430f404e8863be299ef39a0d6032c5d71da9193 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:54:03 -0700 Subject: [PATCH 72/77] nil webrick test --- spec/github-pages/integration_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb index d673a418..f76fa9b2 100644 --- a/spec/github-pages/integration_spec.rb +++ b/spec/github-pages/integration_spec.rb @@ -309,4 +309,10 @@ def rm_destination expect(contents).to match("markdown: CommonMarkGhPages") end end + + context "webrick" do + it "does nothing" do + # all is well + end + end end From 0a6fecc6683a7780fa9840389d3b49bc9cd18b73 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Aug 2024 10:30:26 -0700 Subject: [PATCH 73/77] Attempt to move webrick to the gemspec instead --- github-pages.gemspec | 1 + lib/github-pages/dependencies.rb | 1 - spec/github-pages/dependencies_spec.rb | 1 - spec/github-pages/integration_spec.rb | 6 ------ 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/github-pages.gemspec b/github-pages.gemspec index 9d9594b7..faeb2b4c 100644 --- a/github-pages.gemspec +++ b/github-pages.gemspec @@ -27,6 +27,7 @@ Gem::Specification.new do |s| s.add_dependency("mercenary", "~> 0.3") s.add_dependency("nokogiri", ">= 1.16.2", "< 2.0") s.add_dependency("terminal-table", "~> 1.4") + s.add_dependency("webrick", "~> 1.8") s.add_development_dependency("jekyll_test_plugin_malicious", "~> 0.2") s.add_development_dependency("pry", "~> 0.10") s.add_development_dependency("rspec", "~> 3.3") diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index f131b29a..52ffa371 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -9,7 +9,6 @@ class Dependencies # Jekyll "jekyll" => "3.10.0", "jekyll-sass-converter" => "1.5.2", - "webrick" => "1.8.1", # Converters "kramdown" => "2.4.0", diff --git a/spec/github-pages/dependencies_spec.rb b/spec/github-pages/dependencies_spec.rb index b0248e90..619e9739 100644 --- a/spec/github-pages/dependencies_spec.rb +++ b/spec/github-pages/dependencies_spec.rb @@ -6,7 +6,6 @@ CORE_DEPENDENCIES = %w( jekyll kramdown kramdown-parser-gfm liquid rouge jekyll-sass-converter github-pages-health-check - webrick ).freeze PLUGINS = described_class::VERSIONS.keys - CORE_DEPENDENCIES diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb index f76fa9b2..d673a418 100644 --- a/spec/github-pages/integration_spec.rb +++ b/spec/github-pages/integration_spec.rb @@ -309,10 +309,4 @@ def rm_destination expect(contents).to match("markdown: CommonMarkGhPages") end end - - context "webrick" do - it "does nothing" do - # all is well - end - end end From 1c47cb2cfdac3f3070093f601ea096970899afb2 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Mon, 5 Aug 2024 12:04:45 -0700 Subject: [PATCH 74/77] Fix improperly bound regex --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index bf8614da..07d6bada 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -16,7 +16,7 @@ # Stub all GitHub API requests so they come back empty. config.before(:each) do - stub_request(:get, /api.github.com/) + stub_request(:get, /api\.github.com/) .to_return(:status => 200, :body => "{}", :headers => {}) end end From fdf1e16adb69567277abd5a5fc9ec4e4f9d7d03c Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Aug 2024 10:31:59 -0700 Subject: [PATCH 75/77] Escape all the dots --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 07d6bada..ef7e9e91 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -16,7 +16,7 @@ # Stub all GitHub API requests so they come back empty. config.before(:each) do - stub_request(:get, /api\.github.com/) + stub_request(:get, /api\.github\.com/) .to_return(:status => 200, :body => "{}", :headers => {}) end end From 4565c456bab6bbea3d1f618e7ff7f333571e4951 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Aug 2024 15:43:01 -0700 Subject: [PATCH 76/77] Prep 232 --- lib/github-pages/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb index c69e2cda..6d381bad 100644 --- a/lib/github-pages/version.rb +++ b/lib/github-pages/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module GitHubPages - VERSION = 231 + VERSION = 232 end From 4db45df86c5a8d7b8cdf8b37ea2d946da9ce8aa7 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 27 Nov 2024 14:37:25 -0800 Subject: [PATCH 77/77] Fix security issues in various workflows --- .github/workflows/publish-docker.yml | 14 +++++++++----- .github/workflows/publish-gem.yml | 7 +++++-- .github/workflows/push.yml | 2 ++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 028879a8..5922a803 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -5,10 +5,14 @@ on: tags: [ 'v*' ] pull_request: branches: [ master ] - + env: REGISTRY: ghcr.io +permissions: + contents: read + packages: write + jobs: build: runs-on: ubuntu-latest @@ -18,10 +22,10 @@ jobs: uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 - name: Log in to the Container registry - uses: docker/login-action@v3 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -29,12 +33,12 @@ jobs: - name: Get Docker Metadata id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 with: images: ${{ env.REGISTRY }}/${{ github.repository }} - name: Build Docker Image and Push to Container Registry - uses: docker/build-push-action@v6 + uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 with: context: . push: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/publish-gem.yml b/.github/workflows/publish-gem.yml index 1f9a37a0..4ce9da76 100644 --- a/.github/workflows/publish-gem.yml +++ b/.github/workflows/publish-gem.yml @@ -4,6 +4,9 @@ on: release: types: [released] +permissions: + contents: read + jobs: release: runs-on: ubuntu-latest @@ -11,7 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Setup Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc with: ruby-version: "3.3" - name: Build gem @@ -19,6 +22,6 @@ jobs: gem build github-pages.gemspec - name: Publish gem env: - GEM_HOST_API_KEY: ${{ secrets.PAGES_GEM_PUBLISH }} + GEM_HOST_API_KEY: ${{ secrets.PAGES_GEM_PUBLISH }} run: | gem push github-pages-*.gem diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 84143356..615946fa 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,5 +1,7 @@ on: push name: cibuild on push +permissions: + contents: read jobs: build: name: "GitHub Pages Tests"