Merge pull request #82 from raspbeguy/fix-version

blind-oracle · web-flow · commit a1719801bdf0 · 2024-12-18T10:12:17.000+01:00
fix(): make version a build-time injectable variable
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
 
     - name: Build
       run: |
-        go build ./...
+        go build -ldflags "-X main.Version=${{ github.ref }}" ./...
       env:
         CGO_ENABLED: 0
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.15.0
+1.15.1
diff --git a/main.go b/main.go
@@ -15,7 +15,7 @@ import (
 )
 
 var (
-	version = "0.0.0"
+	Version string
 )
 
 func main() {
@@ -59,7 +59,7 @@ func main() {
 	}
 
 	log.Warnf("Listening on %s, sending to %s", cfg.Listen, cfg.Target)
-	log.Warnf("Started v%s", version)
+	log.Warnf("Started v%s", Version)
 
 	ch := make(chan os.Signal, 1)
 	signal.Notify(ch, syscall.SIGTERM, os.Interrupt)

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`var (`
`18`		`- version = "0.0.0"`
	`18`	`+ Version string`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`func main() {`
`@@ -59,7 +59,7 @@ func main() {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`log.Warnf("Listening on %s, sending to %s", cfg.Listen, cfg.Target)`
`62`		`- log.Warnf("Started v%s", version)`
	`62`	`+ log.Warnf("Started v%s", Version)`
`63`	`63`
`64`	`64`	`ch := make(chan os.Signal, 1)`
`65`	`65`	`signal.Notify(ch, syscall.SIGTERM, os.Interrupt)`