From 3affb02df517e9081593473137fc287ad51057b7 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 22 Dec 2022 03:09:53 +0100 Subject: [PATCH] Run hugo via `go run` and lock its version (#22206) - Don't rely on obscure docker images like `plugins/hugo` - Lock down `hugo` to same version the image had used - Remove unnecessary verbosity in `trans-copy` - Rename `trans-copy` to `trans-copy.sh` Co-authored-by: Lunny Xiao Co-authored-by: John Olheiser Co-authored-by: techknowlogick --- .drone.yml | 5 +---- docs/Makefile | 10 ++++++---- docs/scripts/{trans-copy => trans-copy.sh} | 1 - 3 files changed, 7 insertions(+), 9 deletions(-) rename docs/scripts/{trans-copy => trans-copy.sh} (93%) diff --git a/.drone.yml b/.drone.yml index 48ba3e8f9..2b5d21ddf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -928,11 +928,8 @@ trigger: steps: - name: build-docs - image: plugins/hugo:latest - pull: always + image: golang:1.19 commands: - # https://github.com/drone-plugins/drone-hugo/issues/36 - - apk upgrade --no-cache libcurl && apk add --no-cache make bash curl - cd docs - make trans-copy clean build diff --git a/docs/Makefile b/docs/Makefile index 68afe03e7..fcc932c07 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,6 +2,8 @@ THEME := themes/gitea PUBLIC := public ARCHIVE := https://dl.gitea.io/theme/master.tar.gz +HUGO_PACKAGE := github.com/gohugoio/hugo@v0.81.0 + .PHONY: all all: build @@ -11,19 +13,19 @@ clean: .PHONY: trans-copy trans-copy: - @bash scripts/trans-copy + bash scripts/trans-copy.sh .PHONY: server server: $(THEME) - hugo server + go run $(HUGO_PACKAGE) server .PHONY: build build: $(THEME) - hugo --cleanDestinationDir + go run $(HUGO_PACKAGE) --cleanDestinationDir .PHONY: build-offline build-offline: $(THEME) - hugo --baseURL="/" --cleanDestinationDir + go run $(HUGO_PACKAGE) --baseURL="/" --cleanDestinationDir .PHONY: update update: $(THEME) diff --git a/docs/scripts/trans-copy b/docs/scripts/trans-copy.sh similarity index 93% rename from docs/scripts/trans-copy rename to docs/scripts/trans-copy.sh index 773219288..7374ab9e7 100755 --- a/docs/scripts/trans-copy +++ b/docs/scripts/trans-copy.sh @@ -26,7 +26,6 @@ for SOURCE in $(find ${ROOT}/content -type f -iname *.en-us.md); do DEST="${SOURCE%.en-us.md}.${LOCALE}.md" if [[ ! -f ${DEST} ]]; then - echo "Creating fallback for ${DEST#${ROOT}/content/}" cp ${SOURCE} ${DEST} sed -i.bak "s/en\-us/${LOCALE}/g" ${DEST} rm ${DEST}.bak