From 5c64cd256f541045b1d7019efc309c3d4c22a671 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 20 Jun 2023 09:05:40 +0200 Subject: [PATCH] docs: fix edit links (#1583) --- .github/workflows/release.yml | 2 +- docs/Makefile | 2 +- docs/go.mod | 4 ++-- docs/go.sum | 11 ++++++++--- netlify.toml | 22 ++++++++++++---------- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4980e9e7aa..040940f9b7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -207,7 +207,7 @@ jobs: if: needs.release-please.outputs.releases_created == 'true' with: tag_name: ${{ needs.release-please.outputs.tag_name }} - uses: keptn/docs-tooling/.github/workflows/release-docs.yml@v0.0.2-beta1 + uses: keptn/docs-tooling/.github/workflows/release-docs.yml@v0.1.2 secrets: inherit update-examples: diff --git a/docs/Makefile b/docs/Makefile index a762e8cf11..797f53542b 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,7 +1,7 @@ ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) VOLUMES := -v $(ROOT_DIR):/src # renovate: datasource=docker depName=klakegg/hugo -HUGO_VERSION := 0.107.0 +HUGO_VERSION := 0.111.3 IMAGE := klakegg/hugo:$(HUGO_VERSION)-ext PORT := 1314 DOCKER_CMD := docker run --rm -t -e HUGO_CACHEDIR=/src/tmp/.hugo -e HUGOxPARAMSxGITHUB_REPO="" diff --git a/docs/go.mod b/docs/go.mod index ef6ad6c918..fff703af16 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -4,6 +4,6 @@ go 1.20 require ( github.com/google/docsy/dependencies v0.6.0 // indirect - github.com/keptn/community v0.0.0-20230429154843-72d65a6e2b39 // indirect - github.com/keptn/docs-tooling v0.1.1 // indirect + github.com/keptn/community v0.0.0-20230615192024-1cadfa6b2ad0 // indirect + github.com/keptn/docs-tooling v0.1.2 // indirect ) diff --git a/docs/go.sum b/docs/go.sum index b87cab2184..13a822b5aa 100644 --- a/docs/go.sum +++ b/docs/go.sum @@ -1,9 +1,14 @@ github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= -github.com/google/docsy v0.6.0 h1:43bVF18t2JihAamelQjjGzx1vO2ljCilVrBgetCA8oI= +github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= github.com/google/docsy/dependencies v0.6.0 h1:BFXDCINbp8ZuUGl/mrHjMfhCg+b1YX+hVLAA5fGW7Pc= github.com/google/docsy/dependencies v0.6.0/go.mod h1:EDGc2znMbGUw0RW5kWwy2oGgLt0iVXBmoq4UOqstuNE= -github.com/keptn/community v0.0.0-20230429154843-72d65a6e2b39 h1:cexkJyNwTSwU+XgNKbu3ttr71rK/W9AwuyqUdefzPfc= -github.com/keptn/community v0.0.0-20230429154843-72d65a6e2b39/go.mod h1:0G5nUhSv7ch9BgIFXiY7+U+cV5SbVmneysNGQwQkH8s= +github.com/google/docsy/dependencies v0.7.0 h1:/xUlWCZOSMDubHfrhIz1YtaRn2Oc/swfJ7OUfglXE8U= +github.com/google/docsy/dependencies v0.7.0/go.mod h1:gihhs5gmgeO+wuoay4FwOzob+jYJVyQbNaQOh788lD4= +github.com/keptn/community v0.0.0-20230615192024-1cadfa6b2ad0 h1:gT4CJA5fM9HlF8AGghB7YlS7Yj8wsrBPfpuW22Rc+WU= +github.com/keptn/community v0.0.0-20230615192024-1cadfa6b2ad0/go.mod h1:0G5nUhSv7ch9BgIFXiY7+U+cV5SbVmneysNGQwQkH8s= github.com/keptn/docs-tooling v0.1.1 h1:IuI0Fgs0JrtffLN05iaRZVkRMbPu6h9bxR4C8q1ApGU= github.com/keptn/docs-tooling v0.1.1/go.mod h1:x0iT5YsJosz6wzjQke/YaLgiXF6PV+N8QzxSAc2MY/4= +github.com/keptn/docs-tooling v0.1.2 h1:qKu4U6ugnF7+uQ4buDqYuCehFsGF4bunJYsQWv8MenI= +github.com/keptn/docs-tooling v0.1.2/go.mod h1:x0iT5YsJosz6wzjQke/YaLgiXF6PV+N8QzxSAc2MY/4= github.com/twbs/bootstrap v4.6.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= +github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= diff --git a/netlify.toml b/netlify.toml index 73e13b6eb6..67673b1c72 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,28 +1,30 @@ [build] base = "docs/" publish = "public/" -command = "hugo -b $DEPLOY_PRIME_URL" + +# On netlify our branch will always be the one we are currently building for +# important information regarding naming +# https://gohugo.io/getting-started/configuration/#configure-with-environment-variables +command = "HUGOxPARAMSxGITHUB_BRANCH=$BRANCH hugo -b $DEPLOY_PRIME_URL" ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF . ../netlify.toml" [build.environment] # added specifically a docker image, so the versions within makefile and netlify documentation match # renovate: datasource=docker depName=klakegg/hugo -HUGO_VERSION = "0.107.0" +HUGO_VERSION = "0.111.3" HUGO_ENABLEGITINFO = "true" -# On netlify our branch will always be the one we are currently building for -# important information regarding naming -# https://gohugo.io/getting-started/configuration/#configure-with-environment-variables -HUGOxPARAMSxGITHUB_BRANCH="$BRANCH" - -[context.deploy-preview] +[context.deploy-preview.environment] HUGO_ENV = "development" -[context.branch-deploy] +[context.branch-deploy.environment] HUGO_ENV = "staging" [context.production.environment] HUGO_ENV = "production" [context.production] -command = "hugo -b $URL" +# On netlify our branch will always be the one we are currently building for +# important information regarding naming +# https://gohugo.io/getting-started/configuration/#configure-with-environment-variables +command = "HUGOxPARAMSxGITHUB_BRANCH=$BRANCH hugo -b $URL"