From a506d6d2fe7f319a9edc9f47f8b7e1d34a29bd46 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Fri, 5 Jan 2024 10:27:04 -0800 Subject: [PATCH] site: Build improvements to the site --- Makefile | 3 ++- netlify.toml | 2 +- site/config.toml | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c3f250e1c167..bb9f3052c59e 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,7 @@ VERSION ?= v$(RAW_VERSION) KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/constants/constants.go | cut -d \" -f2) KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2) +HUGO_VERSION ?= $(shell egrep "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions ISO_VERSION ?= v1.32.1-1702708929-17806 @@ -928,7 +929,7 @@ out/hugo/hugo: mkdir -p out (cd site/themes/docsy && npm install) test -d out/hugo || git clone https://github.com/gohugoio/hugo.git out/hugo - (cd out/hugo && go build --tags extended) + (cd out/hugo && git fetch origin && git checkout $(HUGO_VERSION) && go build --tags extended) .PHONY: site site: site/themes/docsy/assets/vendor/bootstrap/package.js out/hugo/hugo ## Serve the documentation site to localhost diff --git a/netlify.toml b/netlify.toml index 413532367a78..7bc18acb92f3 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ publish = "site/public/" command = "pwd && cd themes/docsy && npm install && git submodule update -f --init && cd ../.. && hugo" [build.environment] -NODE_VERSION = "14.21.1" +NODE_VERSION = "20.10.0" HUGO_VERSION = "v0.121.2" [context.production.environment] diff --git a/site/config.toml b/site/config.toml index a0169dfd452c..c841c316031a 100644 --- a/site/config.toml +++ b/site/config.toml @@ -15,7 +15,7 @@ defaultContentLanguageInSubdir = false # Useful when translating. enableMissingTranslationPlaceholders = true -disableKinds = ["taxonomy", "taxonomyTerm"] +disableKinds = ["taxonomy"] # Highlighting config pygmentsCodeFences = true @@ -65,9 +65,10 @@ id = "G-JPP6RFM2BP" [languages] [languages.en] title = "minikube" -description = "minikube is local Kubernetes" languageName = "English" weight = 1 +[languages.en.params] +description = "minikube is local Kubernetes" [params] copyright = "The Kubernetes Authors -- "