Compare commits

..

2 commits

Author SHA1 Message Date
6a3919e95e feat(goreleaser): update changelog configuration
- uses the compare Gitea API
- drop `sort` setting
- remove the filter that excludes version bump entries
2024-11-07 20:07:20 +01:00
61fc21224c feat: set version from git tag on build
- make `GoTomatoVersion` a variable and default it to "devel"
- add ldflags to `.goreleaser.yaml` for version tagging
- remove "v" from output of `-version`
2024-11-07 19:20:29 +01:00
4 changed files with 8 additions and 75 deletions

View file

@ -1,10 +1,10 @@
# vim: set ts=2 sw=2 tw=0 fo=cnqoj # vim: set ts=2 sw=2 tw=0 fo=cnqoj
# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
version: 2 version: 2
before: before:
hooks: hooks:
- rm -fr ./dist
- go mod tidy - go mod tidy
builds: builds:
@ -16,7 +16,7 @@ builds:
env: env:
- CGO_ENABLED=0 - CGO_ENABLED=0
ldflags: ldflags:
- -s -w -X {{.ModulePath}}/internal/metadata.GoTomatoVersion={{.Version}} - -s -w -X git.smsvc.net/pomodoro/GoTomato/internal/metadata.GoTomatoVersion={{.Version}}
upx: upx:
- enabled: true - enabled: true
@ -25,9 +25,6 @@ upx:
changelog: changelog:
use: gitea use: gitea
filters:
exclude:
- "chore: bump version to"
archives: archives:
- format: binary - format: binary

View file

@ -1,34 +0,0 @@
# yaml-language-server: $schema=https://taskfile.dev/schema.json
#
# github.com/go-task/task/v3/cmd/task@latest
# Requirements:
# github.com/caarlos0/svu@latest
# github.com/goreleaser/goreleaser/v2@latest
version: '3'
tasks:
release:
desc: Create and publish an new release
vars:
RELEASE:
sh: svu next
BRANCH:
sh: git branch --show-current
COMMIT:
sh: git rev-parse --short --verify {{.BRANCH}}
preconditions:
- sh: test "{{.BRANCH}}" == "main"
msg: "You must be on the main branch to release"
prompt: Create new release {{.RELEASE}} from {{.COMMIT}}@{{.BRANCH}}?
cmds:
- git tag {{.RELEASE}}
- git push
- git push origin tag {{.RELEASE}}
- goreleaser release --clean
snapshot:
desc: Create a local snapshot release
cmds:
- goreleaser release --clean --snapshot

View file

@ -28,8 +28,8 @@ func Start() {
// show server and protocl version and exit // show server and protocl version and exit
if *showVersionFlag { if *showVersionFlag {
fmt.Printf("GoTomato v%s\n", metadata.GoTomatoVersion) fmt.Println("Server-Version:", metadata.GoTomatoVersion)
fmt.Printf("Protocol-Version: %s\n", metadata.ProtocolVersion) fmt.Println("Protocol-Version:", metadata.ProtocolVersion)
os.Exit(0) os.Exit(0)
} }

View file

@ -1,37 +1,7 @@
package metadata package metadata
import ( import "strings"
"os/exec"
"runtime/debug"
"strings"
)
var ( // This will be overwritten by goreleaser on build
GoTomatoVersion = "" // The GoTomato version var GoTomatoVersion = "devel" // The GoTomato version
ProtocolVersion = "" // The protocol version var ProtocolVersion = strings.Split(GoTomatoVersion, ".")[0] // The protocol version
)
func stripVersionPrefix(version string) string {
return strings.TrimLeft(version, "v")
}
func getLatestTag() string {
bytes, _ := exec.Command("git", "describe", "--tags").Output()
output := strings.TrimSpace(string(bytes))
return stripVersionPrefix(output)
}
// set GoTomatoVersion from runtime/debug.Main.Version
// use latest git tag as fallback
// can be overwritten via ldflags (e,g. by goreleaser)
func init() {
if GoTomatoVersion == "" {
info, _ := debug.ReadBuildInfo()
if info.Main.Version != "(devel)" {
GoTomatoVersion = stripVersionPrefix(info.Main.Version)
} else {
GoTomatoVersion = getLatestTag()
}
}
ProtocolVersion = strings.Split(GoTomatoVersion, ".")[0]
}