From 021ae4f270604a89641c8152159c53efaf81ed8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Mon, 17 Jul 2023 20:09:34 +0200 Subject: [PATCH 1/3] feat: customize the version command --- caddy/mercure/main.go | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/caddy/mercure/main.go b/caddy/mercure/main.go index 72fa6eac..d2165499 100644 --- a/caddy/mercure/main.go +++ b/caddy/mercure/main.go @@ -1,7 +1,11 @@ -// Copied from https://github.com/caddyserver/xcaddy/blob/b7fd102f41e12be4735dc77b0391823989812ce8/environment.go#L251 +// Adapted from https://github.com/caddyserver/xcaddy/blob/b7fd102f41e12be4735dc77b0391823989812ce8/environment.go#L251 package main import ( + "fmt" + "runtime/debug" + + caddy "github.com/caddyserver/caddy/v2" caddycmd "github.com/caddyserver/caddy/v2/cmd" // plug in Caddy modules here. @@ -9,6 +13,26 @@ import ( _ "github.com/dunglas/mercure/caddy" ) +//nolint:gochecknoinits +func init() { + if caddy.CustomVersion != "" { + return + } + + version := "(unknown)" + if bi, ok := debug.ReadBuildInfo(); ok { + for _, m := range bi.Deps { + if m.Path == "github.com/dunglas/mercure" { + version = m.Version + + break + } + } + } + + caddy.CustomVersion = fmt.Sprintf("Mercure.rocks %s Caddy", version) +} + func main() { caddycmd.Main() } From c9756357388bc149d3424d15009c364aecb2941f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Mon, 17 Jul 2023 20:39:54 +0200 Subject: [PATCH 2/3] add ci check --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff630167..742ed68a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,6 +58,10 @@ jobs: sed '1d' profile.cov >> ../profile.cov working-directory: ./caddy + - name: Print version information + run: go run main.go version + working-directory: ./caddy/mercure + - name: Upload coverage results uses: shogo82148/actions-goveralls@v1 with: From 1b1640a6ea54463dadf64036b40cd0ab53bc3331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Mon, 17 Jul 2023 22:37:50 +0200 Subject: [PATCH 3/3] use GoReleaser instead --- .github/workflows/ci.yml | 4 ---- .goreleaser.yml | 2 ++ caddy/mercure/main.go | 26 +------------------------- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 742ed68a..ff630167 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,10 +58,6 @@ jobs: sed '1d' profile.cov >> ../profile.cov working-directory: ./caddy - - name: Print version information - run: go run main.go version - working-directory: ./caddy/mercure - - name: Upload coverage results uses: shogo82148/actions-goveralls@v1 with: diff --git a/.goreleaser.yml b/.goreleaser.yml index 4349662e..ff01fe92 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -22,6 +22,8 @@ env: builds: - id: caddy dir: caddy/mercure + ldflags: + - -X 'github.com/caddyserver/caddy/v2.CustomVersion=Mercure.rocks {{ .Version }} Caddy' goos: - linux - darwin diff --git a/caddy/mercure/main.go b/caddy/mercure/main.go index d2165499..72fa6eac 100644 --- a/caddy/mercure/main.go +++ b/caddy/mercure/main.go @@ -1,11 +1,7 @@ -// Adapted from https://github.com/caddyserver/xcaddy/blob/b7fd102f41e12be4735dc77b0391823989812ce8/environment.go#L251 +// Copied from https://github.com/caddyserver/xcaddy/blob/b7fd102f41e12be4735dc77b0391823989812ce8/environment.go#L251 package main import ( - "fmt" - "runtime/debug" - - caddy "github.com/caddyserver/caddy/v2" caddycmd "github.com/caddyserver/caddy/v2/cmd" // plug in Caddy modules here. @@ -13,26 +9,6 @@ import ( _ "github.com/dunglas/mercure/caddy" ) -//nolint:gochecknoinits -func init() { - if caddy.CustomVersion != "" { - return - } - - version := "(unknown)" - if bi, ok := debug.ReadBuildInfo(); ok { - for _, m := range bi.Deps { - if m.Path == "github.com/dunglas/mercure" { - version = m.Version - - break - } - } - } - - caddy.CustomVersion = fmt.Sprintf("Mercure.rocks %s Caddy", version) -} - func main() { caddycmd.Main() }