diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index b9dd64d..da82843 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -16,7 +16,7 @@ jobs: run: JEKYLL_ENV=production bundle exec jekyll build --verbose --destination site - run: echo "coffeeanddata.ca" > ./site/CNAME - name: test - run: bundle exec htmlproofer --assume-extension --allow-hash-href --http-status-ignore 999,403,500 --url-ignore "/twitter*/,/gstatic*/,/google*/,/tag*/" ./site + run: bundle exec htmlproofer --assume-extension .html --allow-hash-href --no-enforce_https --no-check-external-hash --ignore-status-code 999,403,500 --ignore-urls "/twitter*/,/gstatic*/,/google*/,/tag*/" ./site - name: Deploy uses: s0/git-publish-subdir-action@develop env: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 83931e4..0fe1028 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,7 +14,7 @@ jobs: run: JEKYLL_ENV=production bundle exec jekyll build --verbose --destination site - run: echo "coffeeanddata.ca" > ./site/CNAME - name: test - run: bundle exec htmlproofer --assume-extension --allow-hash-href --http-status-ignore 999,403,500 --url-ignore "/twitter*/,/gstatic*/,/google*/,/tag*/" ./site + run: bundle exec htmlproofer --assume-extension .html --allow-hash-href --no-enforce_https --no-check-external-hash --ignore-status-code 999,403,500 --ignore-urls "/twitter*/,/gstatic*/,/google*/,/tag*/" ./site sonarQube: name: SonarQube runs-on: ubuntu-latest diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e02f930 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "terminal.integrated.profiles.osx": { "zsh": { "path": "/bin/zsh", "args": ["-l", "-i"] } } +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..ff0b28b --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,20 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Serve", + "type": "shell", + "command": "bundle exec jekyll serve --livereload", + }, + { + "label": "Build", + "type": "shell", + "command": "JEKYLL_ENV=production bundle exec jekyll build --destination ./_site", + }, + { + "label": "Test", + "type": "shell", + "command": "bundle exec htmlproofer --assume-extension .html --allow-hash-href --no-enforce_https --no-check-external-hash --ignore-status-code 999,403,500 --ignore-urls \"/twitter*/,/gstatic*/,/google*/,/tag*/\" ./_site", + } + ] +} diff --git a/Gemfile b/Gemfile index b4484c9..4a2755a 100644 --- a/Gemfile +++ b/Gemfile @@ -13,4 +13,4 @@ group :jekyll_plugins do gem 'jekyll-sitemap' end -gem "html-proofer", "~> 3.2" \ No newline at end of file +gem "html-proofer" diff --git a/Gemfile.lock b/Gemfile.lock index b4242e8..fc8be43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,20 @@ GEM remote: https://rubygems.org/ specs: + Ascii85 (1.1.0) addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) + afm (0.2.2) + async (2.6.3) + console (~> 1.10) + fiber-annotation + io-event (~> 1.1) + timers (~> 4.1) colorator (1.1.0) concurrent-ruby (1.2.2) + console (1.18.0) + fiber-annotation + fiber-local em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -12,20 +22,25 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) ffi (1.15.5) + fiber-annotation (0.2.0) + fiber-local (1.0.0) forwardable-extended (2.6.0) google-protobuf (3.23.4-x86_64-darwin) google-protobuf (3.23.4-x86_64-linux) - html-proofer (3.19.4) + hashery (2.1.2) + html-proofer (5.0.7) addressable (~> 2.3) - mercenary (~> 0.3) + async (~> 2.1) nokogiri (~> 1.13) - parallel (~> 1.10) + pdf-reader (~> 2.11) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) + zeitwerk (~> 2.5) http_parser.rb (0.8.0) i18n (1.14.1) concurrent-ruby (~> 1.0) + io-event (1.2.3) jekyll (4.3.2) addressable (~> 2.4) colorator (~> 1.0) @@ -65,36 +80,45 @@ GEM racc (~> 1.4) nokogiri (1.15.3-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) pathutil (0.16.2) forwardable-extended (~> 2.6) + pdf-reader (2.11.0) + Ascii85 (~> 1.0) + afm (~> 0.2.1) + hashery (~> 2.0) + ruby-rc4 + ttfunk public_suffix (5.0.3) racc (1.7.1) rainbow (3.1.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (4.1.2) + rexml (3.2.6) + rouge (4.1.3) + ruby-rc4 (0.1.5) safe_yaml (1.0.5) - sass-embedded (1.64.1-x86_64-darwin) + sass-embedded (1.64.2-x86_64-darwin) google-protobuf (~> 3.23) - sass-embedded (1.64.1-x86_64-linux-gnu) + sass-embedded (1.64.2-x86_64-linux-gnu) google-protobuf (~> 3.23) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) + timers (4.3.5) + ttfunk (1.7.0) typhoeus (1.4.0) ethon (>= 0.9.0) unicode-display_width (2.4.2) webrick (1.8.1) yell (2.2.2) + zeitwerk (2.6.10) PLATFORMS x86_64-darwin-22 x86_64-linux DEPENDENCIES - html-proofer (~> 3.2) + html-proofer jekyll jekyll-paginate jekyll-seo-tag diff --git a/_includes/header.html b/_includes/header.html index 2b9c64d..4e444df 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -3,7 +3,7 @@
{% if site.logo != null %} -

{{site.title}}

+

{{site.title}}

{% else %}

{{site.name}}

{% endif %} @@ -17,4 +17,4 @@

{{site.name}}Open Sidebar

- \ No newline at end of file +