Skip to content

Commit 614b086

Browse files
oleflboleflb
committed
Update to jekyll 4.4.1
1 parent a123f96 commit 614b086

5 files changed

Lines changed: 122 additions & 40 deletions

File tree

‎.github/workflows/jekyll.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Build and deploy Jekyll site
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: read
11+
12+
concurrency:
13+
group: pages
14+
cancel-in-progress: false
15+
16+
jobs:
17+
build:
18+
runs-on: ubuntu-latest
19+
permissions:
20+
contents: read
21+
pages: read
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v7
25+
- name: Set up Ruby
26+
uses: ruby/setup-ruby@v1
27+
with:
28+
ruby-version: "3.4"
29+
bundler-cache: true
30+
- name: Set up Pages
31+
id: pages
32+
uses: actions/configure-pages@v6
33+
- name: Build with Jekyll
34+
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
35+
env:
36+
JEKYLL_ENV: production
37+
- name: Upload Pages artifact
38+
if: github.event_name != 'pull_request'
39+
uses: actions/upload-pages-artifact@v5
40+
41+
deploy:
42+
if: github.event_name != 'pull_request'
43+
needs: build
44+
runs-on: ubuntu-latest
45+
environment:
46+
name: github-pages
47+
url: ${{ steps.deployment.outputs.page_url }}
48+
permissions:
49+
pages: write
50+
id-token: write
51+
steps:
52+
- name: Deploy to GitHub Pages
53+
id: deployment
54+
uses: actions/deploy-pages@v5

‎Gemfile‎

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

3-
gem "jekyll-watch"
4-
gem "webrick"
5-
gem "em-websocket"
3+
gem "jekyll", "~> 4.4.1"
64
gem "jekyll-redirect-from"

‎Gemfile.lock‎

Lines changed: 50 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,92 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
5-
public_suffix (>= 2.0.2, < 6.0)
4+
addressable (2.9.0)
5+
public_suffix (>= 2.0.2, < 8.0)
6+
base64 (0.3.0)
7+
bigdecimal (4.1.2)
68
colorator (1.1.0)
7-
concurrent-ruby (1.1.10)
9+
concurrent-ruby (1.3.8)
10+
csv (3.3.6)
811
em-websocket (0.5.3)
912
eventmachine (>= 0.12.9)
1013
http_parser.rb (~> 0)
1114
eventmachine (1.2.7)
12-
ffi (1.15.5)
15+
ffi (1.17.4-x86_64-linux-gnu)
16+
ffi (1.17.4-x86_64-linux-musl)
1317
forwardable-extended (2.6.0)
14-
http_parser.rb (0.8.0)
15-
i18n (1.12.0)
18+
google-protobuf (4.35.1-x86_64-linux-gnu)
19+
bigdecimal
20+
rake (~> 13.3)
21+
google-protobuf (4.35.1-x86_64-linux-musl)
22+
bigdecimal
23+
rake (~> 13.3)
24+
http_parser.rb (0.8.1)
25+
i18n (1.15.2)
1626
concurrent-ruby (~> 1.0)
17-
jekyll (4.2.2)
27+
jekyll (4.4.1)
1828
addressable (~> 2.4)
29+
base64 (~> 0.2)
1930
colorator (~> 1.0)
31+
csv (~> 3.0)
2032
em-websocket (~> 0.5)
2133
i18n (~> 1.0)
22-
jekyll-sass-converter (~> 2.0)
34+
jekyll-sass-converter (>= 2.0, < 4.0)
2335
jekyll-watch (~> 2.0)
24-
kramdown (~> 2.3)
36+
json (~> 2.6)
37+
kramdown (~> 2.3, >= 2.3.1)
2538
kramdown-parser-gfm (~> 1.0)
2639
liquid (~> 4.0)
27-
mercenary (~> 0.4.0)
40+
mercenary (~> 0.3, >= 0.3.6)
2841
pathutil (~> 0.9)
29-
rouge (~> 3.0)
42+
rouge (>= 3.0, < 5.0)
3043
safe_yaml (~> 1.0)
31-
terminal-table (~> 2.0)
44+
terminal-table (>= 1.8, < 4.0)
45+
webrick (~> 1.7)
3246
jekyll-redirect-from (0.16.0)
3347
jekyll (>= 3.3, < 5.0)
34-
jekyll-sass-converter (2.2.0)
35-
sassc (> 2.0.1, < 3.0)
48+
jekyll-sass-converter (3.1.0)
49+
sass-embedded (~> 1.75)
3650
jekyll-watch (2.2.1)
3751
listen (~> 3.0)
38-
kramdown (2.4.0)
39-
rexml
52+
json (2.21.2)
53+
kramdown (2.5.2)
54+
rexml (>= 3.4.4)
4055
kramdown-parser-gfm (1.1.0)
4156
kramdown (~> 2.0)
42-
liquid (4.0.3)
43-
listen (3.8.0)
57+
liquid (4.0.4)
58+
listen (3.10.0)
59+
logger
4460
rb-fsevent (~> 0.10, >= 0.10.3)
4561
rb-inotify (~> 0.9, >= 0.9.10)
62+
logger (1.7.0)
4663
mercenary (0.4.0)
4764
pathutil (0.16.2)
4865
forwardable-extended (~> 2.6)
49-
public_suffix (5.0.0)
66+
public_suffix (7.0.5)
67+
rake (13.4.2)
5068
rb-fsevent (0.11.2)
51-
rb-inotify (0.10.1)
69+
rb-inotify (0.11.1)
5270
ffi (~> 1.0)
53-
rexml (3.2.5)
54-
rouge (3.30.0)
71+
rexml (3.4.4)
72+
rouge (4.7.0)
5573
safe_yaml (1.0.5)
56-
sassc (2.4.0)
57-
ffi (~> 1.9)
58-
terminal-table (2.0.0)
59-
unicode-display_width (~> 1.1, >= 1.1.1)
60-
unicode-display_width (1.8.0)
61-
webrick (1.7.0)
74+
sass-embedded (1.102.0-x86_64-linux-gnu)
75+
google-protobuf (~> 4.31)
76+
sass-embedded (1.102.0-x86_64-linux-musl)
77+
google-protobuf (~> 4.31)
78+
terminal-table (3.0.2)
79+
unicode-display_width (>= 1.1.1, < 3)
80+
unicode-display_width (2.6.0)
81+
webrick (1.9.2)
6282

6383
PLATFORMS
6484
x86_64-linux
6585
x86_64-linux-musl
6686

6787
DEPENDENCIES
68-
em-websocket
88+
jekyll (~> 4.4.1)
6989
jekyll-redirect-from
70-
jekyll-watch
71-
webrick
7290

7391
BUNDLED WITH
74-
2.4.1
92+
2.6.9

‎docker-compose.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
version: '3'
21
services:
32
jekyll:
4-
image: jekyll/jekyll
3+
image: jekyll/jekyll:4.4.1
54
volumes:
6-
- .:/srv/jekyll
5+
- .:/srv/jekyll:Z
6+
- jekyll_bundle:/usr/local/bundle
77
ports:
88
- "4000:4000"
9-
command: jekyll serve -l
9+
- "35729:35729"
10+
command: sh -c "bundle install && exec bundle exec jekyll serve --livereload --host 0.0.0.0"
11+
12+
volumes:
13+
jekyll_bundle:

‎serve_with_podman.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
#!/bin/env sh
2-
podman run -ti --rm -v .:/srv/jekyll:Z -e JEKYLL_ROOTLESS=1 -p 4000:4000 docker.io/jekyll/jekyll jekyll serve -l
2+
set -eu
3+
4+
podman run -ti --rm \
5+
--volume "$PWD:/srv/jekyll:Z" \
6+
--volume jekyll_bundle:/usr/local/bundle \
7+
--publish 4000:4000 \
8+
--publish 35729:35729 \
9+
docker.io/jekyll/jekyll:4.4.1 \
10+
sh -c 'bundle install && exec bundle exec jekyll serve --livereload --host 0.0.0.0'

0 commit comments

Comments
 (0)