Skip to content

Commit 5d62259

Browse files
Bump nokogiri from 1.18.8 to 1.19.3 (#124)
* Bump nokogiri from 1.18.8 to 1.19.3 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.8 to 1.19.3. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.18.8...v1.19.3) --- updated-dependencies: - dependency-name: nokogiri dependency-version: 1.19.3 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> * Add ruby 3.2 Docker image for local dev and update readme * Update jekyll/rake dependencies and update ruby to 3.2 * temp uncomment deploy job to test build * undo prev commit --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Geethika Hemkumar <geethikah21@gmail.com>
1 parent eb03e8b commit 5d62259

6 files changed

Lines changed: 134 additions & 65 deletions

File tree

.github/workflows/jekyll.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ on:
1313

1414
# Allows you to run this workflow manually from the Actions tab
1515
workflow_dispatch:
16+
inputs:
17+
skip_deploy:
18+
description: "Skip deploy step"
19+
required: true
20+
default: true
21+
type: boolean
1622

1723
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
1824
permissions:
@@ -37,7 +43,7 @@ jobs:
3743
# https://github.com/ruby/setup-ruby/releases/tag/v1.207.0
3844
uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4
3945
with:
40-
ruby-version: '3.1' # Not needed with a .ruby-version file
46+
ruby-version: '3.2' # Not needed with a .ruby-version file
4147
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
4248
cache-version: 0 # Increment this number if you need to re-download cached gems
4349
- name: Setup Pages
@@ -58,6 +64,9 @@ jobs:
5864
name: github-pages
5965
url: ${{ steps.deployment.outputs.page_url }}
6066
runs-on: ubuntu-latest
67+
# inputs are empty (false) on automatic triggering of workflows, and want to run deploy
68+
# in these cases
69+
if: ${{ !inputs.skip_deploy }}
6170
needs: build
6271
steps:
6372
- name: Deploy to GitHub Pages

Dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM ruby:3.2
2+
3+
RUN apt-get update && apt-get install -y \
4+
build-essential \
5+
nodejs \
6+
git \
7+
&& rm -rf /var/lib/apt/lists/*
8+
9+
RUN git config --global --add safe.directory /srv/jekyll
10+
11+
WORKDIR /srv/jekyll
12+
13+
RUN gem install jekyll
14+
RUN gem install bundler
15+
16+
EXPOSE 4000

Gemfile.lock

Lines changed: 101 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,110 +2,154 @@ PATH
22
remote: .
33
specs:
44
bulma-clean-theme (0.6.3)
5-
jekyll (~> 4.0)
5+
jekyll (~> 4.3)
66
jekyll-feed (~> 0.15)
77
jekyll-paginate (~> 1.1)
8-
jekyll-seo-tag (~> 2.6)
8+
jekyll-seo-tag (~> 2.7)
99
jekyll-sitemap (~> 1.4)
1010
kramdown-parser-gfm (~> 1.1)
1111

1212
GEM
1313
remote: https://rubygems.org/
1414
specs:
15-
addressable (2.8.0)
16-
public_suffix (>= 2.0.2, < 5.0)
17-
bibtex-ruby (6.0.0)
15+
addressable (2.9.0)
16+
public_suffix (>= 2.0.2, < 8.0)
17+
base64 (0.3.0)
18+
bibtex-ruby (6.2.0)
1819
latex-decode (~> 0.0)
19-
citeproc (1.0.10)
20+
logger (~> 1.7)
21+
racc (~> 1.7)
22+
bigdecimal (4.1.2)
23+
citeproc (1.1.0)
24+
date
25+
forwardable
26+
json
2027
namae (~> 1.0)
21-
citeproc-ruby (1.1.13)
28+
observer (< 1.0)
29+
open-uri (< 1.0)
30+
citeproc-ruby (2.1.8)
2231
citeproc (~> 1.0, >= 1.0.9)
23-
csl (~> 1.5)
32+
csl (~> 2.0)
33+
observer (< 1.0)
2434
colorator (1.1.0)
25-
concurrent-ruby (1.1.8)
26-
csl (1.5.2)
27-
namae (~> 1.0)
28-
csl-styles (1.0.1.10)
29-
csl (~> 1.0)
30-
em-websocket (0.5.2)
35+
concurrent-ruby (1.3.6)
36+
csl (2.2.1)
37+
forwardable (~> 1.3)
38+
namae (~> 1.2)
39+
open-uri (< 1.0)
40+
rexml (~> 3.0)
41+
set (~> 1.1)
42+
singleton (< 1.0)
43+
time (< 1.0)
44+
csl-styles (2.0.2)
45+
csl (~> 2.0)
46+
csv (3.3.5)
47+
date (3.5.1)
48+
em-websocket (0.5.3)
3149
eventmachine (>= 0.12.9)
32-
http_parser.rb (~> 0.6.0)
50+
http_parser.rb (~> 0)
3351
eventmachine (1.2.7)
34-
ffi (1.15.0)
52+
ffi (1.17.4-x86_64-darwin)
53+
ffi (1.17.4-x86_64-linux-gnu)
54+
forwardable (1.4.0)
3555
forwardable-extended (2.6.0)
36-
http_parser.rb (0.6.0)
37-
i18n (1.8.10)
56+
google-protobuf (4.34.1-x86_64-darwin)
57+
bigdecimal
58+
rake (~> 13.3)
59+
google-protobuf (4.34.1-x86_64-linux-gnu)
60+
bigdecimal
61+
rake (~> 13.3)
62+
http_parser.rb (0.8.1)
63+
i18n (1.14.8)
3864
concurrent-ruby (~> 1.0)
39-
jekyll (4.2.0)
65+
jekyll (4.4.1)
4066
addressable (~> 2.4)
67+
base64 (~> 0.2)
4168
colorator (~> 1.0)
69+
csv (~> 3.0)
4270
em-websocket (~> 0.5)
4371
i18n (~> 1.0)
44-
jekyll-sass-converter (~> 2.0)
72+
jekyll-sass-converter (>= 2.0, < 4.0)
4573
jekyll-watch (~> 2.0)
46-
kramdown (~> 2.3)
74+
json (~> 2.6)
75+
kramdown (~> 2.3, >= 2.3.1)
4776
kramdown-parser-gfm (~> 1.0)
4877
liquid (~> 4.0)
49-
mercenary (~> 0.4.0)
78+
mercenary (~> 0.3, >= 0.3.6)
5079
pathutil (~> 0.9)
51-
rouge (~> 3.0)
80+
rouge (>= 3.0, < 5.0)
5281
safe_yaml (~> 1.0)
53-
terminal-table (~> 2.0)
54-
jekyll-feed (0.15.1)
82+
terminal-table (>= 1.8, < 4.0)
83+
webrick (~> 1.7)
84+
jekyll-feed (0.17.0)
5585
jekyll (>= 3.7, < 5.0)
5686
jekyll-paginate (1.1.0)
57-
jekyll-sass-converter (2.1.0)
58-
sassc (> 2.0.1, < 3.0)
59-
jekyll-scholar (7.0.0)
87+
jekyll-sass-converter (3.1.0)
88+
sass-embedded (~> 1.75)
89+
jekyll-scholar (7.3.0)
6090
bibtex-ruby (~> 6.0)
61-
citeproc-ruby (~> 1.0)
62-
csl-styles (~> 1.0)
91+
citeproc-ruby (>= 2.1.6)
92+
csl-styles (~> 2.0)
6393
jekyll (~> 4.0)
64-
jekyll-seo-tag (2.7.1)
94+
jekyll-seo-tag (2.9.0)
6595
jekyll (>= 3.8, < 5.0)
6696
jekyll-sitemap (1.4.0)
6797
jekyll (>= 3.7, < 5.0)
6898
jekyll-watch (2.2.1)
6999
listen (~> 3.0)
70-
kramdown (2.3.1)
71-
rexml
100+
json (2.19.5)
101+
kramdown (2.5.2)
102+
rexml (>= 3.4.4)
72103
kramdown-parser-gfm (1.1.0)
73104
kramdown (~> 2.0)
74-
latex-decode (0.3.2)
75-
liquid (4.0.3)
76-
listen (3.5.1)
105+
latex-decode (0.4.2)
106+
liquid (4.0.4)
107+
listen (3.10.0)
108+
logger
77109
rb-fsevent (~> 0.10, >= 0.10.3)
78110
rb-inotify (~> 0.9, >= 0.9.10)
111+
logger (1.7.0)
79112
mercenary (0.4.0)
80-
namae (1.1.1)
81-
nokogiri (1.18.8-arm64-darwin)
82-
racc (~> 1.4)
83-
nokogiri (1.18.8-x86_64-linux-gnu)
113+
namae (1.2.0)
114+
racc (~> 1.7)
115+
nokogiri (1.19.3-x86_64-darwin)
84116
racc (~> 1.4)
85-
nokogiri (1.18.8-x86_64-linux-musl)
117+
nokogiri (1.19.3-x86_64-linux-gnu)
86118
racc (~> 1.4)
119+
observer (0.1.2)
120+
open-uri (0.5.0)
121+
stringio
122+
time
123+
uri
87124
pathutil (0.16.2)
88125
forwardable-extended (~> 2.6)
89-
public_suffix (4.0.6)
126+
public_suffix (7.0.5)
90127
racc (1.8.1)
91-
rake (12.3.3)
92-
rb-fsevent (0.10.4)
93-
rb-inotify (0.10.1)
128+
rake (13.4.2)
129+
rb-fsevent (0.11.2)
130+
rb-inotify (0.11.1)
94131
ffi (~> 1.0)
95-
rexml (3.4.2)
96-
rouge (3.26.0)
132+
rexml (3.4.4)
133+
rouge (4.7.0)
97134
safe_yaml (1.0.5)
98-
sassc (2.4.0)
99-
ffi (~> 1.9)
100-
terminal-table (2.0.0)
101-
unicode-display_width (~> 1.1, >= 1.1.1)
102-
unicode-display_width (1.7.0)
103-
webrick (1.8.2)
135+
sass-embedded (1.99.0-x86_64-darwin)
136+
google-protobuf (~> 4.31)
137+
sass-embedded (1.99.0-x86_64-linux-gnu)
138+
google-protobuf (~> 4.31)
139+
set (1.1.3)
140+
singleton (0.3.0)
141+
stringio (3.2.0)
142+
terminal-table (3.0.2)
143+
unicode-display_width (>= 1.1.1, < 3)
144+
time (0.4.2)
145+
date
146+
unicode-display_width (2.6.0)
147+
uri (1.1.1)
148+
webrick (1.9.2)
104149

105150
PLATFORMS
106-
arm64-darwin-23
151+
x86_64-darwin-24
107152
x86_64-linux
108-
x86_64-linux-musl
109153

110154
DEPENDENCIES
111155
bulma-clean-theme!
@@ -118,8 +162,8 @@ DEPENDENCIES
118162
kramdown (>= 2.3.0)
119163
kramdown-parser-gfm
120164
nokogiri
121-
rake (~> 12.0)
165+
rake (~> 13.0)
122166
webrick (~> 1.8)
123167

124168
BUNDLED WITH
125-
2.2.2
169+
2.4.19

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build with Docker
2-
Assuming you have Docker installed, pull the following image:
2+
Assuming you have Docker installed, build the container:
33
```bash
4-
$ docker pull jekyll/jekyll:latest
4+
$ docker compose build
55
```
66
Run a container:
77
```bash

bulma-clean-theme.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ Gem::Specification.new do |spec|
1212

1313
spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|_posts|blog|LICENSE|README|package|node_modules|favicon)!i) }
1414

15-
spec.add_runtime_dependency "jekyll", "~> 4.0"
15+
spec.add_runtime_dependency "jekyll", "~> 4.3"
1616
spec.add_runtime_dependency "jekyll-feed", "~> 0.15"
1717
spec.add_runtime_dependency "jekyll-sitemap", "~> 1.4"
1818
spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
19-
spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.6"
19+
spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.7"
2020
spec.add_runtime_dependency "kramdown-parser-gfm", "~> 1.1"
2121

2222
spec.add_development_dependency "bundler", "~> 2.0"
23-
spec.add_development_dependency "rake", "~> 12.0"
23+
spec.add_development_dependency "rake", "~> 13.0"
2424
end

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
jekyll:
3-
image: jekyll/jekyll:latest
4-
command: jekyll serve --watch --force_polling --livereload
3+
build: .
4+
command: "/bin/sh -c 'bundle install && bundle exec jekyll serve --host 0.0.0.0 --watch --force_polling --livereload'"
55
ports:
66
- 4000:4000
77
volumes:

0 commit comments

Comments
 (0)