Skip to content

Commit bce8db9

Browse files
committed
docs: switch to jekyll-theme-read-the-docs
Pin to a specific commit for reproducibility. (cherry picked from commit 4faf4df)
1 parent d4cc19a commit bce8db9

File tree

5 files changed

+4
-14
lines changed

5 files changed

+4
-14
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,11 @@ poll-images:
246246

247247
site-build:
248248
@mkdir -p docs/vendor/bundle
249-
$(SITE_BUILD_CMD) sh -c "bundle plugin install bundler-override && bundle install && jekyll build $(JEKYLL_OPTS)"
249+
$(SITE_BUILD_CMD) sh -c "bundle install && jekyll build $(JEKYLL_OPTS)"
250250

251251
site-serve:
252252
@mkdir -p docs/vendor/bundle
253-
$(SITE_BUILD_CMD) sh -c "bundle plugin install bundler-override && bundle install && jekyll serve $(JEKYLL_OPTS) -H 127.0.0.1"
253+
$(SITE_BUILD_CMD) sh -c "bundle install && jekyll serve $(JEKYLL_OPTS) -H 127.0.0.1"
254254

255255
benchmark:
256256
go test -bench=./pkg/nfd-master -run=^# ./pkg/nfd-master

docs/Gemfile

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

3-
# Use override plugin to drop incorrect dependency of jekyll-rtd-them on github-pages (~> 209)
4-
# The original dep would allow github-pages v209.x but not v210 or later.
5-
plugin 'bundler-override'
6-
require File.join(Bundler::Plugin.index.load_paths("bundler-override")[0], "bundler-override") rescue nil
7-
override 'jekyll-rtd-theme', :drop => "github-pages"
8-
93
# Hello! This is where you manage which Jekyll version is used to run.
104
# When you want to use a different version, change it below, save the
115
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
@@ -35,5 +29,3 @@ gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
3529
#gem "kramdown-parser-gfm"
3630

3731
gem "webrick", "~> 1.8"
38-
39-
gem 'jekyll-rtd-theme', '~> 2.0', '>= 2.0.10'

docs/Gemfile.lock

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ GEM
157157
jekyll (>= 3.5, < 5.0)
158158
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
159159
rubyzip (>= 1.3.0, < 3.0)
160-
jekyll-rtd-theme (2.0.10)
161160
jekyll-sass-converter (1.5.2)
162161
sass (~> 3.4)
163162
jekyll-seo-tag (2.8.0)
@@ -278,7 +277,6 @@ PLATFORMS
278277
DEPENDENCIES
279278
github-pages (~> 228)
280279
jekyll (~> 3.9.0)
281-
jekyll-rtd-theme (~> 2.0, >= 2.0.10)
282280
tzinfo (~> 2.0)
283281
tzinfo-data
284282
wdm (~> 0.1.1)

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ markdown: kramdown
2626
kramdown:
2727
toc_levels: 1..3
2828

29-
theme: jekyll-rtd-theme
29+
remote_theme: jv-conseil/jekyll-theme-read-the-docs@ce7ed5ad2184b36244a50adbeea2f0a6ab1f8606
3030

3131
# Exclude from processing.
3232
# The following items will not be processed, by default. Create a custom list

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Netlify settings
22
[build]
3-
command = "cd docs/ && source /opt/buildhome/.rvm/scripts/rvm && rvm install ruby-3.1.6 && bundle plugin install bundler-override && bundle install && jekyll build"
3+
command = "cd docs/ && source /opt/buildhome/.rvm/scripts/rvm && rvm install ruby-3.1.7 && bundle install && jekyll build"
44
publish = "docs/_site/"

0 commit comments

Comments
 (0)