Compare commits
2 Commits
d56e33b171
...
v0.8.0
| Author | SHA1 | Date | |
|---|---|---|---|
| af7683da9a | |||
| 3c801842e4 |
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
go install github.com/goreleaser/goreleaser/v2@v2.12.3
|
go install github.com/goreleaser/goreleaser/v2@v2.14.1
|
||||||
|
|
||||||
if [ ! -z "${harbor_username:-}" ]; then
|
if [ ! -z "${harbor_username:-}" ]; then
|
||||||
DOCKER_FILE=~/.docker/config.json
|
DOCKER_FILE=~/.docker/config.json
|
||||||
@@ -13,11 +13,11 @@ if [ ! -z "${harbor_username:-}" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DRONE_TAG=${DRONE_TAG-""}
|
CI_TAG=${CI_COMMIT_TAG:-${DRONE_TAG:-""}}
|
||||||
|
|
||||||
is_snapshot=""
|
is_snapshot=""
|
||||||
|
|
||||||
if [ -z "$DRONE_TAG" ]; then
|
if [ -z "$CI_TAG" ]; then
|
||||||
is_snapshot="--snapshot"
|
is_snapshot="--snapshot"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -90,10 +90,13 @@ func init() {
|
|||||||
VERSION = "dev-snapshot"
|
VERSION = "dev-snapshot"
|
||||||
} else {
|
} else {
|
||||||
if !strings.HasPrefix(VERSION, "v") {
|
if !strings.HasPrefix(VERSION, "v") {
|
||||||
VERSION = "v" + VERSION
|
vVersion := "v" + VERSION
|
||||||
|
if semver.IsValid(vVersion) {
|
||||||
|
VERSION = vVersion
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if !semver.IsValid(VERSION) {
|
if !semver.IsValid(VERSION) && VERSION != "dev-snapshot" {
|
||||||
slog.Default().Warn("invalid version number", "version", VERSION)
|
slog.Default().Info("non-semver version", "version", VERSION)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if bi, ok := debug.ReadBuildInfo(); ok {
|
if bi, ok := debug.ReadBuildInfo(); ok {
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
|
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
dto "github.com/prometheus/client_model/go"
|
dto "github.com/prometheus/client_model/go"
|
||||||
|
"golang.org/x/mod/semver"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCheckVersion(t *testing.T) {
|
func TestCheckVersion(t *testing.T) {
|
||||||
@@ -48,9 +49,12 @@ func TestVersionInfo(t *testing.T) {
|
|||||||
t.Error("VersionInfo().Version should not be empty")
|
t.Error("VersionInfo().Version should not be empty")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Version should start with "v" or be "dev-snapshot"
|
// Version should start with "v", be "dev-snapshot", or be a non-semver string (e.g. branch name)
|
||||||
if !strings.HasPrefix(info.Version, "v") && info.Version != "dev-snapshot" {
|
if !strings.HasPrefix(info.Version, "v") && info.Version != "dev-snapshot" {
|
||||||
t.Errorf("Version should start with 'v' or be 'dev-snapshot', got: %s", info.Version)
|
// Non-semver versions like branch names ("main") are acceptable
|
||||||
|
if semver.IsValid("v" + info.Version) {
|
||||||
|
t.Errorf("Semver-like version should start with 'v', got: %s", info.Version)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// GitRevShort should be <= 7 characters if set
|
// GitRevShort should be <= 7 characters if set
|
||||||
@@ -398,10 +402,10 @@ func TestParseBuildTimeConsistency(t *testing.T) {
|
|||||||
|
|
||||||
func BenchmarkParseBuildTime(b *testing.B) {
|
func BenchmarkParseBuildTime(b *testing.B) {
|
||||||
inputs := []string{
|
inputs := []string{
|
||||||
"1672531200", // Unix epoch
|
"1672531200", // Unix epoch
|
||||||
"2023-01-01T00:00:00Z", // RFC3339
|
"2023-01-01T00:00:00Z", // RFC3339
|
||||||
"invalid-timestamp", // Invalid
|
"invalid-timestamp", // Invalid
|
||||||
"", // Empty
|
"", // Empty
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, input := range inputs {
|
for _, input := range inputs {
|
||||||
|
|||||||
Reference in New Issue
Block a user