Merge pull request #2204 from marquiz/devel/docs-theme-rtd

docs: switch to jekyll-theme-read-the-docs

Author: k8s-ci-robot

Makefile

@@ -255,11 +255,11 @@ poll-images:
 
 site-build:
 	@mkdir -p docs/vendor/bundle
-	$(SITE_BUILD_CMD) sh -c "bundle plugin install bundler-override && bundle install && jekyll build $(JEKYLL_OPTS)"
+	$(SITE_BUILD_CMD) sh -c "bundle install && jekyll build $(JEKYLL_OPTS)"
 
 site-serve:
 	@mkdir -p docs/vendor/bundle
-	$(SITE_BUILD_CMD) sh -c "bundle plugin install bundler-override && bundle install && jekyll serve $(JEKYLL_OPTS) -H 127.0.0.1"
+	$(SITE_BUILD_CMD) sh -c "bundle install && jekyll serve $(JEKYLL_OPTS) -H 127.0.0.1"
 
 benchmark:
 	go test -bench=./pkg/nfd-master -run=^# ./pkg/nfd-master

docs/Gemfile

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

docs/Gemfile.lock

@@ -168,7 +168,6 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
       rubyzip (>= 1.3.0, < 3.0)
-    jekyll-rtd-theme (2.0.10)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.8.0)
@@ -290,7 +289,6 @@ DEPENDENCIES
   github-pages (~> 232)
   jekyll (~> 3.10.0)
   jekyll-github-metadata!
-  jekyll-rtd-theme (~> 2.0, >= 2.0.10)
   tzinfo (~> 2.0)
   tzinfo-data
   wdm (~> 0.1.1)

docs/_config.yml

@@ -26,7 +26,7 @@ markdown: kramdown
 kramdown:
   toc_levels: 1..3
 
-theme: jekyll-rtd-theme
+remote_theme: jv-conseil/jekyll-theme-read-the-docs@ce7ed5ad2184b36244a50adbeea2f0a6ab1f8606
 
 # Exclude from processing.
 # The following items will not be processed, by default. Create a custom list

netlify.toml

@@ -1,6 +1,6 @@
 # Netlify settings
 [build]
-    command = "cd docs/ && source /opt/buildhome/.rvm/scripts/rvm && rvm install ruby-3.3.8 && bundle plugin install bundler-override && bundle install && jekyll build"
+    command = "cd docs/ && source /opt/buildhome/.rvm/scripts/rvm && rvm install ruby-3.3.9 && bundle install && jekyll build"
     publish = "docs/_site/"
 
 [build.environment]