From 84de46a2f25b6b1d845d1431576f23dba114721d Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 11 Feb 2026 12:20:36 +1100 Subject: [PATCH] cleanup version numbers --- .dockerignore | 1 - .drone.yml | 3 --- Dockerfile | 7 +++---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.dockerignore b/.dockerignore index 15f5646..f8f6606 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,7 +5,6 @@ docker-data README-DEV.md -changelog-beta.md *.log *.tmp diff --git a/.drone.yml b/.drone.yml index 6d7055e..2b1dac9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,10 +13,7 @@ steps: image: cache.coadcorp.com/library/golang commands: - XTEVE_VERSION="$(grep -m1 '^#### ' changelog-beta.md | cut -d' ' -f2 | sed 's/-beta$//')" - - SOURCE_VERSION="$(grep -m1 '^var Version = ' xteve.go | cut -d' ' -f4 | tr -d '"')" - test -n "$XTEVE_VERSION" || (echo "Could not parse version from changelog-beta.md" && exit 1) - - test -n "$SOURCE_VERSION" || (echo "Could not parse source version from xteve.go" && exit 1) - - test "$SOURCE_VERSION" = "$XTEVE_VERSION" || (echo "Version mismatch changelog=$XTEVE_VERSION source=$SOURCE_VERSION" && exit 1) - echo "Building xTeVe version $XTEVE_VERSION from changelog-beta.md" - go build -v -ldflags "-X main.Version=$XTEVE_VERSION" ./... diff --git a/Dockerfile b/Dockerfile index c13b274..3a5b354 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,10 @@ COPY . . ARG TARGETOS ARG TARGETARCH -RUN XTEVE_VERSION="$(awk '/^#### /{print $2; exit}' changelog-beta.md)" \ - && XTEVE_VERSION="${XTEVE_VERSION%-beta}" \ - && test -n "${XTEVE_VERSION}" \ +RUN XTEVE_VERSION="$(grep -m1 '^#### ' changelog-beta.md | cut -d' ' -f2 | sed 's/-beta$//')" \ + && test -n "$XTEVE_VERSION" \ && CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \ - go build -trimpath -ldflags="-s -w -X main.Version=${XTEVE_VERSION}" -o /out/xteve ./xteve.go + go build -trimpath -ldflags="-s -w -X main.Version=$XTEVE_VERSION" -o /out/xteve ./xteve.go FROM alpine:3.23