From 9a1a937ca4017d3fa512b7e430017df331836e5b Mon Sep 17 00:00:00 2001 From: paoloredis Date: Wed, 20 Aug 2025 14:31:55 +0200 Subject: [PATCH 1/2] Update docs-nav to dynamically create version dropdown for products --- layouts/partials/docs-nav.html | 45 ++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/layouts/partials/docs-nav.html b/layouts/partials/docs-nav.html index 52b1f36485..b7b06fd9e5 100644 --- a/layouts/partials/docs-nav.html +++ b/layouts/partials/docs-nav.html @@ -23,11 +23,26 @@ + {{- $entries := readDir "content/operate/kubernetes" -}} + {{- $vers := slice -}} + + {{- range $e := $entries -}} + {{- if and $e.IsDir (findRE `^\d+\.\d+\.\d+$` $e.Name) -}} + {{- $p := split $e.Name "." -}} + {{- $maj := int (index $p 0) -}} + {{- $min := int (index $p 1) -}} + {{- $pat := int (index $p 2) -}} + {{- $key := printf "%03d.%03d.%03d" $maj $min $pat -}} {{/* for sorting */}} + {{- $vers = $vers | append (dict "v" $e.Name "key" $key) -}} + {{- end -}} + {{- end -}} + {{- $vers = sort $vers "key" "desc" -}} + {{else if (eq (.Params.linkTitle) "Redis Software")}} @@ -37,10 +52,26 @@ + {{- $entries := readDir "content/operate/rs" -}} + {{- $vers := slice -}} + + {{- range $e := $entries -}} + {{- if and $e.IsDir (findRE `^\d+\.\d+$` $e.Name) -}} + {{- $p := split $e.Name "." -}} + {{- $maj := int (index $p 0) -}} + {{- $min := int (index $p 1) -}} + {{- $pat := int (index $p 2) -}} + {{- $key := printf "%03d.%03d.%03d" $maj $min $pat -}} {{/* for sorting */}} + {{- $vers = $vers | append (dict "v" $e.Name "key" $key) -}} + {{- end -}} + {{- end -}} + {{- $vers = sort $vers "key" "desc" -}} + From 0d0f68d958b7d4774f97d762165db35914d28d22 Mon Sep 17 00:00:00 2001 From: paoloredis Date: Thu, 21 Aug 2025 09:17:41 +0200 Subject: [PATCH 2/2] Fix logic for workflows --- .github/workflows/main-staging.yml | 4 ++ .github/workflows/main.yml | 4 ++ layouts/partials/docs-nav.html | 71 +++++++++++++++++++++--------- 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main-staging.yml b/.github/workflows/main-staging.yml index cfa4215477..e20cc39ab7 100644 --- a/.github/workflows/main-staging.yml +++ b/.github/workflows/main-staging.yml @@ -66,6 +66,10 @@ jobs: rs_versions=($(find content/operate/rs/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}')) rdi_versions=($(find content/integrate/redis-data-integration/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}')) + printf "%s\n" "${kubernetes_versions[@]}" > kubernetes-versions + printf "%s\n" "${rs_versions[@]}" > rs-versions + printf "%s\n" "${rdi_versions[@]}" > rdi-versions + # build latest for version in "${kubernetes_versions[@]}"; do rm -r "content/operate/kubernetes/${version}" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5cadded7fa..2995d0b10b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -66,6 +66,10 @@ jobs: rs_versions=($(find content/operate/rs/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}')) rdi_versions=($(find content/integrate/redis-data-integration/ -maxdepth 1 -type d -regex ".*[0-9-]" | awk -F/ '{print $NF}')) + printf "%s\n" "${kubernetes_versions[@]}" > kubernetes-versions + printf "%s\n" "${rs_versions[@]}" > rs-versions + printf "%s\n" "${rdi_versions[@]}" > rdi-versions + # build latest for version in "${kubernetes_versions[@]}"; do rm -r "content/operate/kubernetes/${version}" diff --git a/layouts/partials/docs-nav.html b/layouts/partials/docs-nav.html index b7b06fd9e5..9c4521c686 100644 --- a/layouts/partials/docs-nav.html +++ b/layouts/partials/docs-nav.html @@ -23,25 +23,41 @@ - {{- $entries := readDir "content/operate/kubernetes" -}} {{- $vers := slice -}} + {{- $lines := slice -}} - {{- range $e := $entries -}} - {{- if and $e.IsDir (findRE `^\d+\.\d+\.\d+$` $e.Name) -}} - {{- $p := split $e.Name "." -}} - {{- $maj := int (index $p 0) -}} - {{- $min := int (index $p 1) -}} - {{- $pat := int (index $p 2) -}} - {{- $key := printf "%03d.%03d.%03d" $maj $min $pat -}} {{/* for sorting */}} - {{- $vers = $vers | append (dict "v" $e.Name "key" $key) -}} + {{ if fileExists "kubernetes-versions" }} + {{- $txt := readFile "kubernetes-versions" -}} + {{- $lines = split $txt "\n" -}} + + {{- range $lines }} + {{- $v := strings.TrimSpace . -}} + {{- if and (ne $v "") (findRE `^\d+\.\d+\.\d+$` $v) -}} + {{- $p := split $v "." -}} + {{- $key := printf "%03d.%03d.%03d" (int (index $p 0)) (int (index $p 1)) (int (index $p 2)) -}} + {{- $vers = $vers | append (dict "v" $v "key" $key) -}} {{- end -}} {{- end -}} + {{ else }} + {{- $entries := readDir "content/operate/kubernetes" -}} + {{- range $e := $entries -}} + {{- if and $e.IsDir (findRE `^\d+\.\d+\.\d+$` $e.Name) -}} + {{- $p := split $e.Name "." -}} + {{- $maj := int (index $p 0) -}} + {{- $min := int (index $p 1) -}} + {{- $pat := int (index $p 2) -}} + {{- $key := printf "%03d.%03d.%03d" $maj $min $pat -}} {{/* for sorting */}} + {{- $vers = $vers | append (dict "v" $e.Name "key" $key) -}} + {{- end -}} + {{- end -}} + {{ end}} + {{- $vers = sort $vers "key" "desc" -}} @@ -52,25 +68,40 @@ - {{- $entries := readDir "content/operate/rs" -}} {{- $vers := slice -}} + {{- $lines := slice -}} - {{- range $e := $entries -}} - {{- if and $e.IsDir (findRE `^\d+\.\d+$` $e.Name) -}} - {{- $p := split $e.Name "." -}} - {{- $maj := int (index $p 0) -}} - {{- $min := int (index $p 1) -}} - {{- $pat := int (index $p 2) -}} - {{- $key := printf "%03d.%03d.%03d" $maj $min $pat -}} {{/* for sorting */}} - {{- $vers = $vers | append (dict "v" $e.Name "key" $key) -}} + {{ if fileExists "rs-versions" }} + {{- $txt := readFile "rs-versions" -}} + {{- $lines = split $txt "\n" -}} + + {{- range $lines }} + {{- $v := strings.TrimSpace . -}} + {{- if and (ne $v "") (findRE `^\d+\.\d+$` $v) -}} + {{- $p := split $v "." -}} + {{- $key := printf "%03d.%03d" (int (index $p 0)) (int (index $p 1)) -}} + {{- $vers = $vers | append (dict "v" $v "key" $key) -}} {{- end -}} {{- end -}} + {{ else }} + {{- $entries := readDir "content/operate/rs" -}} + {{- range $e := $entries -}} + {{- if and $e.IsDir (findRE `^\d+\.\d+$` $e.Name) -}} + {{- $p := split $e.Name "." -}} + {{- $maj := int (index $p 0) -}} + {{- $min := int (index $p 1) -}} + {{- $key := printf "%03d.%03d" $maj $min -}} {{/* for sorting */}} + {{- $vers = $vers | append (dict "v" $e.Name "key" $key) -}} + {{- end -}} + {{- end -}} + {{ end}} + {{- $vers = sort $vers "key" "desc" -}}