From fcf26a168827c525da1ba53f44c60cb97c875c79 Mon Sep 17 00:00:00 2001 From: Fabian Rodriguez Date: Fri, 26 Apr 2024 20:39:42 +0200 Subject: [PATCH] Move lts to kong versions (#7299) * Bump jekyll-generator-single-source * Set lts: true in kong_versions.yml --- Gemfile | 2 +- Gemfile.lock | 12 +++++++++--- app/_data/kong_versions.yml | 3 +++ app/_includes/docs-sidebar.html | 4 ++-- app/_layouts/docs-v2.html | 2 +- app/_plugins/drops/releases_dropdown.rb | 4 ++++ 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index d074f6cb0349..fe6feb5fbec4 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'jekyll' gem 'jekyll-include-cache' gem 'jekyll-redirect-from' -gem 'jekyll-generator-single-source' +gem 'jekyll-generator-single-source', github: 'kong/jekyll-generator-single-source', branch: 'add-lts-to-release' gem 'kramdown-parser-gfm' gem 'liquid-c' gem 'rouge', '3.30.0' diff --git a/Gemfile.lock b/Gemfile.lock index 6d9f52d01b67..dc99cd9d746d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/kong/jekyll-generator-single-source.git + revision: aa0dc3f841ba8b55fcd53b23e0ed8726e80df393 + branch: add-lts-to-release + specs: + jekyll-generator-single-source (0.0.13) + jekyll (>= 4.2, < 5.0) + PATH remote: app/_src/.repos/kuma/jekyll-kuma-plugins specs: @@ -92,8 +100,6 @@ GEM safe_yaml (~> 1.0) terminal-table (>= 1.8, < 4.0) webrick (~> 1.7) - jekyll-generator-single-source (0.0.13) - jekyll (>= 4.2, < 5.0) jekyll-include-cache (0.2.1) jekyll (>= 3.7, < 5.0) jekyll-redirect-from (0.16.0) @@ -221,7 +227,7 @@ DEPENDENCIES capybara foreman jekyll - jekyll-generator-single-source + jekyll-generator-single-source! jekyll-include-cache jekyll-kuma-plugins! jekyll-redirect-from diff --git a/app/_data/kong_versions.yml b/app/_data/kong_versions.yml index 052f73ba99be..30ac794bd995 100644 --- a/app/_data/kong_versions.yml +++ b/app/_data/kong_versions.yml @@ -43,6 +43,7 @@ libyaml: "0.2.5" pcre: "8.45" lua_doc: true + lts: true - release: "3.0.x" ee-version: "3.0.2.0" ce-version: "3.0.2" @@ -113,6 +114,7 @@ libyaml: "0.2.5" pcre: 8.45 lua_doc: true + lts: true - release: "3.5.x" ee-version: "3.5.0.3" ce-version: "3.5.0" @@ -260,6 +262,7 @@ - release: "2.8.x" version: "2.8.2" edition: "kubernetes-ingress-controller" + lts: true - release: "2.9.x" version: "2.9.3" edition: "kubernetes-ingress-controller" diff --git a/app/_includes/docs-sidebar.html b/app/_includes/docs-sidebar.html index d966244e15c9..093f98d05d19 100644 --- a/app/_includes/docs-sidebar.html +++ b/app/_includes/docs-sidebar.html @@ -63,7 +63,7 @@ {% if include.release.latest? %} (latest) {% endif %} - {% if include.release == '2.8.x' or include.release == '3.4.x' %} + {% if include.release.lts %} (LTS) {% endif %} @@ -73,7 +73,7 @@ {% for option in include.releases_dropdown.options reversed %}
  • - {{ option.value }}{% if option.value == '2.8.x' or option.value == '3.4.x' %} (LTS){% endif %} + {{ option.value }}{% if option.lts %} (LTS){% endif %}
  • {% endfor %} diff --git a/app/_layouts/docs-v2.html b/app/_layouts/docs-v2.html index 2c706c605c59..1e1b306287a3 100644 --- a/app/_layouts/docs-v2.html +++ b/app/_layouts/docs-v2.html @@ -27,7 +27,7 @@ {% if page.release.latest? %} (latest) {% endif %} - {% if page.release == '2.8.x' or page.release == '3.4.x' %} + {% if page.release.lts %} LTS {% endif %} diff --git a/app/_plugins/drops/releases_dropdown.rb b/app/_plugins/drops/releases_dropdown.rb index 879db4bf0cc6..d7e19c91c9e2 100644 --- a/app/_plugins/drops/releases_dropdown.rb +++ b/app/_plugins/drops/releases_dropdown.rb @@ -30,6 +30,10 @@ def data_id @data_id ||= @release.value end + def lts + @release.lts + end + private def label