Skip to content

Commit 4f58da9

Browse files
MichaelCurrinMichaelCurrin
authored
Merge pull request #37 from MichaelCurrin/build-jekyll-4-upgrade
Build: Jekyll 4 upgrade
2 parents d888f48 + f45c891 commit 4f58da9

File tree

152 files changed

+469
-436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+469
-436
lines changed

‎.github/workflows/main.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: GH Pages Deploy
2+
3+
on:
4+
push:
5+
branches: master
6+
paths-ignore:
7+
- README.md
8+
9+
pull_request:
10+
branches: master
11+
paths-ignore:
12+
- README.md
13+
14+
jobs:
15+
build-deploy:
16+
name: Build and deploy
17+
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- name: Checkout 🛎️
22+
uses: actions/checkout@v2
23+
24+
- name: Set up Ruby 💎
25+
uses: ruby/setup-ruby@v1
26+
with:
27+
ruby-version: "3"
28+
bundler-cache: true
29+
30+
- name: Build 🏗
31+
run: make build
32+
33+
- name: Deploy to GH Pages 🚀
34+
if: ${{ github.event_name != 'pull_request' }}
35+
uses: peaceiris/actions-gh-pages@v3
36+
with:
37+
github_token: ${{ secrets.GITHUB_TOKEN }}
38+
publish_dir: _site

‎Gemfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem "jekyll", "~> 3.9"
4-
gem "kramdown-parser-gfm", "~> 1.1.0"
3+
gem "jekyll", "~> 4.2"
54
gem "webrick", "~> 1.7"
65

76
gem "fractal", git: "https://github.com/MichaelCurrin/fractal"
8-
9-
group :jekyll_plugins do
10-
gem "jekyll-remote-theme", "~> 0.4.3"
11-
end

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![License: MIT](https://img.shields.io/badge/License-MIT-blue)](#license)
66

77
[![Hosted with - GitHub Pages](https://img.shields.io/badge/Hosted_with-GitHub_Pages-blue?logo=github&logoColor=white)](https://pages.github.com/)
8-
[![Made with Jekyll](https://img.shields.io/badge/Jekyll-3.9-blue.svg?logo=jekyll)](https://jekyllrb.com)
8+
[![Made with Jekyll](https://img.shields.io/badge/Jekyll-4-blue.svg?logo=jekyll)](https://jekyllrb.com)
99

1010

1111
## Preview

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ strict_front_matter: true
3434

3535
### Theme boilerplate ###
3636

37-
remote_theme: MichaelCurrin/fractal
37+
theme: fractal
3838

3939
titles_from_headings:
4040
strip_title: true

‎_includes/head.html‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{% comment %}Override until theme moves to Jekyll 4{% endcomment %}
2+
<head>
3+
<meta charset="utf-8">
4+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
7+
{%- seo -%}
8+
9+
<link rel="stylesheet" href="{% link assets/main.scss %}">
10+
11+
{%- feed_meta -%}
12+
13+
{%- include google-analytics.html -%}
14+
</head>

‎about.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,12 @@ There may be missing context or explanations and obvious things are excluded. As
5656
- [Cheatsheet Factory](https://cheatsheetfactory.geekyhacker.com/)
5757
- [Jekyll cheatsheet](https://learn.cloudcannon.com/jekyll-cheat-sheet/) on CloudCannon site
5858

59-
### My projects
59+
### Similar sites to Dev Cheatsheets
6060

61-
- [MichaelCurrin.github.io](https://michaelcurrin.github.io/)
6261
- [Learn to Code](https://github.com/MichaelCurrin/learn-to-code)
6362
- [Code Cookbook](https://github.com/MichaelCurrin/code-cookbook)
63+
64+
### My other websites
65+
66+
- [MichaelCurrin.github.io](https://michaelcurrin.github.io/)
6467
- [Badge Generator](https://michaelcurrin.github.io/badge-generator)

‎cheatsheets/ci-cd/github-actions/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Here are some other areas to start with:
1818
- [Jobs][]
1919
- [Triggers][]
2020

21-
[Jobs]: {{ site.baseurl }}{% link cheatsheets/ci-cd/github-actions/jobs.md %}
22-
[Triggers]: {{ site.baseurl }}{% link cheatsheets/ci-cd/github-actions/triggers.md %}
21+
[Jobs]: {% link cheatsheets/ci-cd/github-actions/jobs.md %}
22+
[Triggers]: {% link cheatsheets/ci-cd/github-actions/triggers.md %}
2323

2424
### Related
2525

‎cheatsheets/containers/docker-cli/delete.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ If you have Docker Desktop, you can also use that - see the "Clean up" section.
77

88
- [Prune][] cheatsheet
99

10-
[Prune]: {{ site.baseurl }}{% link cheatsheets/containers/docker-cli/prune.md %}
10+
[Prune]: {% link cheatsheets/containers/docker-cli/prune.md %}
1111

1212

1313
## Resources
@@ -55,5 +55,3 @@ Get the details from:
5555
```sh
5656
$ docker images
5757
```
58-
59-

‎cheatsheets/containers/docker-cli/docker-compose.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
See [Docker Compose CLI][] cheatsheet.
44

5-
[Docker Compose CLI]: {{ site.baseurl }}{% link cheatsheets/containers/docker-compose/cli.md %}
5+
[Docker Compose CLI]: {% link cheatsheets/containers/docker-compose/cli.md %}

‎cheatsheets/containers/docker-cli/manage-containers.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
See also the [Run containers][] cheatsheet.
44

5-
[Run containers]: {{ site.baseurl }}{% link cheatsheets/containers/docker-cli/run-containers.md %}
5+
[Run containers]: {% link cheatsheets/containers/docker-cli/run-containers.md %}
66

77

88
## List
@@ -55,4 +55,3 @@ Remove a stopped container.
5555
```sh
5656
$ docker rm my-app
5757
```
58-

0 commit comments

Comments
 (0)