From d134321b5f329cebf31e99d4149f82e16d3c18bc Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 9 Sep 2024 11:03:58 -0700 Subject: [PATCH 1/3] use newer htmlproofer --- .github/workflows/htmlproofer.yml | 2 +- Gemfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/htmlproofer.yml b/.github/workflows/htmlproofer.yml index ad7f8f7e..75c112c8 100644 --- a/.github/workflows/htmlproofer.yml +++ b/.github/workflows/htmlproofer.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest name: HTML Proofer env: - HTMLPROOFER_OPTIONS: './_site --internal-domains=pid.codes --check-html --check-opengraph --report-missing-names --log-level=:debug --url-ignore /www.andreas.org/,/www.kbles.ru/,/github.com\/KK2345\/TinyPassword$/,/github.com\/KK2345\/TinyPassword\/blob\/master\/README.md/,/www.oshec.org/,/github.com\/xuio\/Cynteract$/,/github.com\/mattomatto\/craft$/,/triparts.strikingly.com$/,/facebook.com/varioskybean$/' + HTMLPROOFER_OPTIONS: './_site --check-html --check-opengraph --report-missing-names --log-level=:debug --url-ignore /www.andreas.org/,/www.kbles.ru/,/github.com\/KK2345\/TinyPassword$/,/github.com\/KK2345\/TinyPassword\/blob\/master\/README.md/,/www.oshec.org/,/github.com\/xuio\/Cynteract$/,/github.com\/mattomatto\/craft$/,/triparts.strikingly.com$/,/facebook.com/varioskybean$/' steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 diff --git a/Gemfile b/Gemfile index 5090158a..4a0ebc45 100644 --- a/Gemfile +++ b/Gemfile @@ -11,4 +11,5 @@ end gem "github-pages", versions['github-pages'] gem "redcarpet" -gem "html-proofer", '>=3.3.1', '<4.0.0' +gem "html-proofer", '>=3.3.1' + From 2c541d4e3ec3b5c5ef49b04d327bc9a722de48cb Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 9 Sep 2024 11:06:00 -0700 Subject: [PATCH 2/3] Bump ruby --- .github/workflows/htmlproofer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/htmlproofer.yml b/.github/workflows/htmlproofer.yml index 75c112c8..00e5f7ce 100644 --- a/.github/workflows/htmlproofer.yml +++ b/.github/workflows/htmlproofer.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6' + ruby-version: '3.3' - uses: actions/cache@v4 with: path: vendor/bundle From 5a44eb243a38b2b3130f212005f9240ebc72056a Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 9 Sep 2024 12:10:08 -0700 Subject: [PATCH 3/3] Update command line --- .github/workflows/htmlproofer.yml | 4 ++-- Gemfile | 8 +++----- _includes/footer.html | 17 ++--------------- _includes/head.html | 4 ++-- _includes/post_footer.html | 2 +- 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/workflows/htmlproofer.yml b/.github/workflows/htmlproofer.yml index 00e5f7ce..6c852ee2 100644 --- a/.github/workflows/htmlproofer.yml +++ b/.github/workflows/htmlproofer.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest name: HTML Proofer env: - HTMLPROOFER_OPTIONS: './_site --check-html --check-opengraph --report-missing-names --log-level=:debug --url-ignore /www.andreas.org/,/www.kbles.ru/,/github.com\/KK2345\/TinyPassword$/,/github.com\/KK2345\/TinyPassword\/blob\/master\/README.md/,/www.oshec.org/,/github.com\/xuio\/Cynteract$/,/github.com\/mattomatto\/craft$/,/triparts.strikingly.com$/,/facebook.com/varioskybean$/' + HTMLPROOFER_OPTIONS: '--ignore-urls /www.andreas.org/,/www.kbles.ru/,/github.com\/KK2345\/TinyPassword$/,/github.com\/KK2345\/TinyPassword\/blob\/master\/README.md/,/www.oshec.org/,/github.com\/xuio\/Cynteract$/,/github.com\/mattomatto\/craft$/,/triparts.strikingly.com$/,/facebook.com/varioskybean$/' steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 @@ -23,7 +23,7 @@ jobs: bundle install --jobs 4 --retry 3 - run: bundle exec jekyll doctor - run: bundle exec jekyll build - - run: bundle exec htmlproofer $HTMLPROOFER_OPTIONS --disable-external + - run: bundle exec htmlproofer ./_site --swap-urls "http[s]\://pid.codes:" --no-enforce-https --disable-external --log-level=:debug $HTMLPROOFER_OPTIONS # External check fail because they fetch too quickly from sites and get # 429 responses. We should cache checks and rate limit them as well. # - run: bundle exec htmlproofer $HTMLPROOFER_OPTIONS diff --git a/Gemfile b/Gemfile index 4a0ebc45..ae80d221 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,9 @@ +source "https://rubygems.org" + require "json" require "open-uri" -source "https://rubygems.org" - -versions = open("https://pages.github.com/versions.json") do |source| - JSON.parse(source.read) -end +versions = JSON.parse(OpenURI.open_uri('https://pages.github.com/versions.json').read) # Github Pages environment gem "github-pages", versions['github-pages'] diff --git a/_includes/footer.html b/_includes/footer.html index 9c2ce67d..938f0c41 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -2,22 +2,9 @@
- Layout crafted with <3 by John Otander (@4lpine). - </> available on Github. + Layout crafted with <3 by John Otander (@4lpine). + </> available on Github.
- -{% if site.google_analytics %} - -{% endif %} diff --git a/_includes/head.html b/_includes/head.html index 13bc629d..45fc405b 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -12,8 +12,8 @@ - - + + {% if site.show_social_icons or site.show_sharing_icons %} {% endif %} diff --git a/_includes/post_footer.html b/_includes/post_footer.html index 9fdb646e..0d3dfb9c 100755 --- a/_includes/post_footer.html +++ b/_includes/post_footer.html @@ -1,7 +1,7 @@
John Otander

- Pixyll is an open-source Jekyll theme that's built by John Otander. + Pixyll is an open-source Jekyll theme that's built by John Otander. When he's not writing code and building things, he likes to ski. A. Lot.