From 79c836ffe5a63961ba0bb95734caff9b1718000c Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 14 Jun 2022 19:29:09 +0200 Subject: [PATCH] add var to store version tag & adjust Justfile --- .woodpecker.yml | 2 +- Justfile | 3 +++ server/handler.go | 3 ++- server/version/version.go | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 server/version/version.go diff --git a/.woodpecker.yml b/.woodpecker.yml index 5a8dd29..adce5b8 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -22,7 +22,7 @@ pipeline: image: a6543/golang_just commands: - go version - - just build + - just build-tag ${CI_COMMIT_TAG##v} test: image: a6543/golang_just diff --git a/Justfile b/Justfile index f711172..a908e7a 100644 --- a/Justfile +++ b/Justfile @@ -11,6 +11,9 @@ dev: build: CGO_ENABLED=0 go build -ldflags '-s -w' -v -o build/codeberg-pages-server ./ +build-tag VERSION: + CGO_ENABLED=0 go build -ldflags '-s -w -X "codeberg.org/codeberg/pages/server/version.Version={{VERSION}}"' -v -o build/codeberg-pages-server ./ + lint: tool-golangci tool-gofumpt [ $(gofumpt -extra -l . | wc -l) != 0 ] && { echo 'code not formated'; exit 1; }; \ golangci-lint run --timeout 5m --build-tags integration diff --git a/server/handler.go b/server/handler.go index bda7bd0..3a2667d 100644 --- a/server/handler.go +++ b/server/handler.go @@ -14,6 +14,7 @@ import ( "codeberg.org/codeberg/pages/server/gitea" "codeberg.org/codeberg/pages/server/upstream" "codeberg.org/codeberg/pages/server/utils" + "codeberg.org/codeberg/pages/server/version" ) // Handler handles a single HTTP request to the web server. @@ -26,7 +27,7 @@ func Handler(mainDomainSuffix, rawDomain []byte, return func(ctx *fasthttp.RequestCtx) { log := log.With().Str("Handler", string(ctx.Request.Header.RequestURI())).Logger() - ctx.Response.Header.Set("Server", "Codeberg Pages") + ctx.Response.Header.Set("Server", "CodebergPages/"+version.Version) // Force new default from specification (since November 2020) - see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy#strict-origin-when-cross-origin ctx.Response.Header.Set("Referrer-Policy", "strict-origin-when-cross-origin") diff --git a/server/version/version.go b/server/version/version.go new file mode 100644 index 0000000..aa2cbb5 --- /dev/null +++ b/server/version/version.go @@ -0,0 +1,3 @@ +package version + +var Version string = "dev"