This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-site.git
The following commit(s) were added to refs/heads/main by this push:
new d2bc441 Update to Jekyll 4.2.2
d2bc441 is described below
commit d2bc4416b4dda9e5b7179c82fdd9132ac34ee422
Author: Steve Lawrence <[email protected]>
AuthorDate: Thu May 22 12:18:58 2025 -0400
Update to Jekyll 4.2.2
Our build/publish action currently uses jekyll 4.2.0, but ASF recently
updated things and only whitelisted the jekyll docker image 4.2.2. This
updates dependencies and our build/publish action to use jekyll 4.2.2.
All that is needed is a number of dependency updates and manually
specifying a few new dependencies that are no longer packaged by
default.
Also bumps the github action ubuntu version from 20.04 to to 22.04, the
previous version is no longer supported by github.
---
.github/workflows/build-publish.yml | 4 +--
Gemfile | 8 +++--
Gemfile.lock | 61 +++++++++++++++++++++----------------
README.md | 4 +--
4 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/.github/workflows/build-publish.yml
b/.github/workflows/build-publish.yml
index 5f870ba..4a60edc 100644
--- a/.github/workflows/build-publish.yml
+++ b/.github/workflows/build-publish.yml
@@ -24,7 +24,7 @@ on:
jobs:
build-publish:
name: Build & Publish
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
strategy:
fail-fast: false
@@ -35,7 +35,7 @@ jobs:
fetch-depth: 0
- name: Build
- uses: docker://jekyll/jekyll:4.2.0
+ uses:
docker://jekyll/jekyll@sha256:400b8d1569f118bca8a3a09a25f32803b00a55d1ea241feaf5f904d66ca9c625
# v4.2.2
env:
JEKYLL_ROOTLESS: 1
with:
diff --git a/Gemfile b/Gemfile
index c7677f2..175a2de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,5 +15,9 @@
source 'https://rubygems.org'
-gem 'jekyll-asciidoc', '= 3.0.0'
-gem 'asciidoctor-diagram', '= 2.2.1'
+gem 'jekyll', '= 4.2.2'
+gem 'jekyll-asciidoc', '= 3.0.1'
+gem 'asciidoctor-diagram', '= 3.0.0'
+gem 'asciidoctor-diagram-plantuml', '= 1.2025.2'
+gem 'asciidoctor-diagram-ditaamini', '= 1.0.3'
+gem 'webrick', '= 1.9.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index e405832..cf0aaef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,28 +1,29 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
- asciidoctor (2.0.16)
- asciidoctor-diagram (2.2.1)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
+ asciidoctor (2.0.23)
+ asciidoctor-diagram (3.0.0)
asciidoctor (>= 1.5.7, < 3.x)
- asciidoctor-diagram-ditaamini (~> 1.0)
- asciidoctor-diagram-plantuml (~> 1.2021)
rexml
- asciidoctor-diagram-ditaamini (1.0.1)
- asciidoctor-diagram-plantuml (1.2021.8)
+ asciidoctor-diagram-batik (1.17)
+ asciidoctor-diagram-ditaamini (1.0.3)
+ asciidoctor-diagram-plantuml (1.2025.2)
+ asciidoctor-diagram-batik (~> 1.17)
colorator (1.1.0)
- concurrent-ruby (1.1.9)
+ concurrent-ruby (1.3.5)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
- ffi (1.15.4)
+ ffi (1.17.2-x86_64-linux-gnu)
+ ffi (1.17.2-x86_64-linux-musl)
forwardable-extended (2.6.0)
http_parser.rb (0.8.0)
- i18n (1.8.11)
+ i18n (1.14.7)
concurrent-ruby (~> 1.0)
- jekyll (4.2.1)
+ jekyll (4.2.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -37,43 +38,49 @@ GEM
rouge (~> 3.0)
safe_yaml (~> 1.0)
terminal-table (~> 2.0)
- jekyll-asciidoc (3.0.0)
- asciidoctor (>= 1.5.0)
+ jekyll-asciidoc (3.0.1)
+ asciidoctor (>= 1.5.0, < 3.0.0)
jekyll (>= 3.0.0)
- jekyll-sass-converter (2.1.0)
+ jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
- kramdown (2.3.1)
- rexml
+ kramdown (2.5.1)
+ rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
- liquid (4.0.3)
- listen (3.7.0)
+ liquid (4.0.4)
+ listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (4.0.6)
- rb-fsevent (0.11.0)
- rb-inotify (0.10.1)
+ public_suffix (6.0.2)
+ rb-fsevent (0.11.2)
+ rb-inotify (0.11.1)
ffi (~> 1.0)
- rexml (3.2.5)
- rouge (3.26.1)
+ rexml (3.4.1)
+ rouge (3.30.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.8.0)
+ webrick (1.9.1)
PLATFORMS
+ x86_64-linux
x86_64-linux-musl
DEPENDENCIES
- asciidoctor-diagram (= 2.2.1)
- jekyll-asciidoc (= 3.0.0)
+ asciidoctor-diagram (= 3.0.0)
+ asciidoctor-diagram-ditaamini (= 1.0.3)
+ asciidoctor-diagram-plantuml (= 1.2025.2)
+ jekyll (= 4.2.2)
+ jekyll-asciidoc (= 3.0.1)
+ webrick (= 1.9.1)
BUNDLED WITH
- 2.2.24
+ 2.3.25
diff --git a/README.md b/README.md
index 06ba62f..6f9a457 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ With docker:
docker run -it --rm \
--publish 127.0.0.1:4000:4000 \
--volume="$PWD:/srv/jekyll" \
- docker.io/jekyll/jekyll:4.2.0 \
+ docker.io/jekyll/jekyll:4.2.2 \
jekyll serve --watch --source site
With rootless podman:
@@ -43,7 +43,7 @@ With rootless podman:
--publish 127.0.0.1:4000:4000 \
--volume="$PWD:/srv/jekyll" \
--env JEKYLL_ROOTLESS=1 \
- docker.io/jekyll/jekyll:4.2.0 \
+ docker.io/jekyll/jekyll:4.2.2 \
jekyll serve --watch --source site
Then open [http://localhost:4000](http://localhost:4000) to view the site
