Merge pull request #970 from tannewt/fix_htmlproofer

Fix htmlproofer

Author: tannewt

.github/workflows/htmlproofer.yml

@@ -5,12 +5,12 @@ 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: '--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
         with:
-          ruby-version: '2.6'
+          ruby-version: '3.3'
       - uses: actions/cache@v4
         with:
           path: vendor/bundle
@@ -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

Gemfile

@@ -1,14 +1,13 @@
+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']
 gem "redcarpet"
 
-gem "html-proofer", '>=3.3.1', '<4.0.0'
+gem "html-proofer", '>=3.3.1'
+

_includes/footer.html

@@ -2,22 +2,9 @@
   <div class="p2 wrap">
     <div class="measure mt1 center">
       <small>
-        Layout crafted with &lt;3 by <a href="http://johnotander.com">John Otander</a> (<a href="https://twitter.com/4lpine">@4lpine</a>).
-        &lt;/&gt; available on <a href="https://github.com/johnotander/pixyll">Github</a>.
+        Layout crafted with &lt;3 by <a href="https://www.johno.com">John Otander</a> (<a href="https://twitter.com/4lpine">@4lpine</a>).
+        &lt;/&gt; available on <a href="https://github.com/johno/pixyll">Github</a>.
       </small>
     </div>
   </div>
 </footer>
-
-{% if site.google_analytics %}
-<script>
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-ga('create', '{{ site.google_analytics }}', 'auto');
-ga('send', 'pageview');
-
-</script>
-{% endif %}

_includes/head.html

@@ -12,8 +12,8 @@
     <link rel="stylesheet" href="{{ "/css/pixyll.css" | prepend: site.baseurl }}" type="text/css">
 
     <!-- Fonts -->
-    <link href='//fonts.googleapis.com/css?family=Merriweather:900,900italic,300,300italic' rel='stylesheet' type='text/css'>
-    <link href='//fonts.googleapis.com/css?family=Lato:900,300' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Merriweather:900,900italic,300,300italic' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Lato:900,300' rel='stylesheet' type='text/css'>
     {% if site.show_social_icons or site.show_sharing_icons %}
       <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
     {% endif %}

_includes/post_footer.html

@@ -1,7 +1,7 @@
 <div class="py2 post-footer">
   <img src="/images/me.jpeg" alt="John Otander" class="avatar" />
   <p>
-    Pixyll is an open-source Jekyll theme that's built by <a href="http://johnotander.com">John Otander</a>.
+    Pixyll is an open-source Jekyll theme that's built by <a href="https://www.johno.com">John Otander</a>.
     When he's not writing code and building things, he likes to ski. A. Lot.
   </p>
   <p>