Merge pull request #11 from MichaelCurrin/build-upgrade-jekyll

build: upgrade Jekyll to 4

Author: MichaelCurrin

.github/workflows/main.yml

@@ -0,0 +1,38 @@
+name: GH Pages Deploy
+
+on:
+  push:
+    branches: master
+    paths-ignore:
+      - README.md
+
+  pull_request:
+    branches: master
+    paths-ignore:
+      - README.md
+
+jobs:
+  build-deploy:
+    name: Build and deploy
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby 💎
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3"
+          bundler-cache: true
+
+      - name: Build 🏗
+        run: make build
+
+      - name: Deploy to GH Pages 🚀
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: _site

Gemfile

@@ -1,11 +1,6 @@
 source "https://rubygems.org"
 
-gem "jekyll", "~> 3.9"
-gem "kramdown-parser-gfm", "~> 1.1.0"
+gem "jekyll", "~> 4.2"
 gem "webrick", "~> 1.7"
 
 gem "fractal", git: "https://github.com/MichaelCurrin/fractal"
-
-group :jekyll_plugins do
-  gem "jekyll-remote-theme", "~> 0.4.3"
-end

README.md

@@ -1,10 +1,11 @@
 # Code Cookbook 👩‍💻👨‍🍳📖🥗
 > Reusable code patterns which you can use as reference or copy to your project
 
+[![GH Pages Deploy](https://github.com/MichaelCurrin/code-cookbook/workflows/GH%20Pages%20Deploy/badge.svg)](https://github.com/MichaelCurrin/code-cookbook/actions?query=workflow:"GH+Pages+Deploy")
 [![GitHub tag](https://img.shields.io/github/tag/MichaelCurrin/code-cookbook?include_prereleases&sort=semver)](https://github.com/MichaelCurrin/code-cookbook/releases/)
 [![License](https://img.shields.io/badge/License-MIT-blue)](#license)
 
-[![Jekyll - 3.9](https://img.shields.io/badge/Jekyll-3.9-blue?logo=jekyll&logoColor=white)](https://jekyllrb.com)
+[![Jekyll](https://img.shields.io/badge/Jekyll-4-blue?logo=jekyll&logoColor=white)](https://jekyllrb.com)
 [![theme - fractal](https://img.shields.io/static/v1?label=theme&message=fractal&color=blue&logo=github)](https://github.com/MichaelCurrin/fractal)
 [![Hosted with - GitHub Pages](https://img.shields.io/badge/Hosted_with-GitHub_Pages-blue?logo=github&logoColor=white)](https://pages.github.com/)
 
@@ -22,7 +23,7 @@
 
 <div align="center">
 
-[![View site - GH Pages](https://img.shields.io/static/v1?label=View+site&message=GH+Pages&color=2ea44f&style=for-the-badge)](https://michaelcurrin.github.io/code-cookbook/)
+[![View site - GH Pages](https://img.shields.io/static/v1?label=View+site&message=GH+Pages&color=2ea44f&style=for-the-badge)](https://michaelcurrin.github.io/code-cookbook/ "Go to website")
 
 </div>
 

_config.yml

@@ -35,7 +35,7 @@ strict_front_matter: true
 
 ### Theme boilerplate ###
 
-remote_theme: MichaelCurrin/fractal
+theme: fractal
 
 titles_from_headings:
   strip_title: true

index.md

@@ -7,12 +7,12 @@ layout: home
 
 Welcome to **Code Cookbook**.
 
-This aims to have an entire recipe to solve a problem. Such as a script or config, or a few files which work together. 
+This aims to have an entire recipe to solve a problem. Such as a script or config, or a few files which work together.
 
 And the recipes are based on real-world code as much as possible, collecting from repos or docs I encounter or from my own projects.
 
 <div align="center" style="padding-bottom: 1em;">
-    <a href="{{ site.baseurl }}{% link recipes/index.md %}">
+    <a href="{% link recipes/index.md %}">
         <img src="https://img.shields.io/badge/all_recipe_topics-blue?style=for-the-badge"
             alt="Go to recipes"/>
     </a>
@@ -47,12 +47,12 @@ Highlights of this site.
     - Commands and configs for using Docker and Kubernetes.
 
 
-[Vue]: {{ site.baseurl }}{% link recipes/javascript/packages/vue/index.md %}
-[EditorConfig]: {{ site.baseurl }}{% link recipes/other/editor-config.md %}
-[Make]: {{ site.baseurl }}{% link recipes/make/index.md %}
-[CI/CD]: {{ site.baseurl }}{% link recipes/ci-cd/index.md %}
-[Workflows]: {{ site.baseurl }}{% link recipes/ci-cd/github-actions/workflows/index.md %}
-[SEO]: {{ site.baseurl }}{% link recipes/web/seo/index.md %}
-[Shell]: {{ site.baseurl }}{% link recipes/shell/index.md %}
-[Jekyll]: {{ site.baseurl }}{% link recipes/jekyll/index.md %}
-[Containers]: {{ site.baseurl }}{% link recipes/containers/index.md %}
+[Vue]: {% link recipes/javascript/packages/vue/index.md %}
+[EditorConfig]: {% link recipes/other/editor-config.md %}
+[Make]: {% link recipes/make/index.md %}
+[CI/CD]: {% link recipes/ci-cd/index.md %}
+[Workflows]: {% link recipes/ci-cd/github-actions/workflows/index.md %}
+[SEO]: {% link recipes/web/seo/index.md %}
+[Shell]: {% link recipes/shell/index.md %}
+[Jekyll]: {% link recipes/jekyll/index.md %}
+[Containers]: {% link recipes/containers/index.md %}

recipes/ansible/index.md

@@ -5,7 +5,7 @@ logo: ansible
 
 Default config files in the root `/etc/ansible/` directory:
 
-- [Config]({{ site.baseurl }}{% link recipes/ansible/config.md %})
-- [Hosts]({{ site.baseurl }}{% link recipes/ansible/hosts.md %})
+- [Config]({% link recipes/ansible/config.md %})
+- [Hosts]({% link recipes/ansible/hosts.md %})
 
 See [User guide](https://docs.ansible.com/ansible/latest/user_guide/index.html) in the docs.

recipes/ci-cd/github-actions/index.md

@@ -17,6 +17,6 @@ Here are some places to start to get into workflow file samples.
     - See sample workflows across programming languages.
 
 [GitHub Actions]: https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/
-[Basic generic workflow]: {{ site.baseurl }}{% link recipes/ci-cd/github-actions/workflows/basic.md %}
-[Basic Node workflow]: {{ site.baseurl }}{% link recipes/ci-cd/github-actions/workflows/node/basic.md %}
-[Workflows]: {{ site.baseurl }}{% link recipes/ci-cd/github-actions/workflows/index.md %}
+[Basic generic workflow]: {% link recipes/ci-cd/github-actions/workflows/basic.md %}
+[Basic Node workflow]: {% link recipes/ci-cd/github-actions/workflows/node/basic.md %}
+[Workflows]: {% link recipes/ci-cd/github-actions/workflows/index.md %}

recipes/ci-cd/github-actions/tokens/index.md

@@ -7,17 +7,17 @@ A GitHub Action needs permissions to push to your `gh-pages` branch - so you mus
 
 Here are the approaches, from simplest to most complex to manage. A summary is provided.
 
-- [GitHub token]({{ site.baseurl }}{% link recipes/ci-cd/github-actions/tokens/github-token.md %})
+- [GitHub token]({% link recipes/ci-cd/github-actions/tokens/github-token.md %})
 	- API key scoped to a single repo.
 	- Auto-generated for a GH workflow - low effort.
 	- Very secure - you never have to copy or even view the value.
 	- The main limitation is that this only works for GitHub Actions, unlike the others.
-- [Access token]({{ site.baseurl }}{% link recipes/ci-cd/github-actions/tokens/access-token.md %})
+- [Access token]({% link recipes/ci-cd/github-actions/tokens/access-token.md %})
 	- API key scoped to **all** repos in your GH account.
 	- Easy to generate and add to a workflow.
 	- **Warning** - this is the least secure. A token is for your entire profile, not per repo. With public repo access, a token gives read and write access to all your public repos - a compromised token can be used to do a lot of damage.
 	- This key is useful for doing actions with the GH API such as reporting on stats.
-- [Deploy key]({{ site.baseurl }}{% link recipes/ci-cd/github-actions/tokens/deploy-key.md %})
+- [Deploy key]({% link recipes/ci-cd/github-actions/tokens/deploy-key.md %})
 	- API key scoped to a repo.
 	- Needs to be generated **locally** once using SSH tool and your email address then pasted in so it takes more effort.
 	- Slightly less secure then GH Token as you deal with a value, but this is more flexible.

recipes/ci-cd/github-actions/workflows/basic.md

@@ -5,7 +5,7 @@ description: Minimal workflows for GH Actions to get you started
 
 If you are a JS developer, see the [Basic Node][] section.
 
-[Basic Node]: {{ site.baseurl }}{% link recipes/ci-cd/github-actions/workflows/node/basic.md %}
+[Basic Node]: {% link recipes/ci-cd/github-actions/workflows/node/basic.md %}
 
 
 ## Samples

recipes/ci-cd/github-actions/workflows/build-release-assets/go.md

@@ -3,4 +3,4 @@ title: Release Go assets
 logo: go
 ---
 
-See the [Go]({{ site.baseurl }}{% link recipes/ci-cd/github-actions/workflows/go/index.md %}) workflows section.
+See the [Go]({% link recipes/ci-cd/github-actions/workflows/go/index.md %}) workflows section.