Explorar o código

Fix auto-generated version (git describe)

Frédéric Guillot %!s(int64=5) %!d(string=hai) anos
pai
achega
b539eb8575
Modificáronse 4 ficheiros con 4 adicións e 4 borrados
  1. 1 1
      Makefile
  2. 1 1
      packaging/debian/build.sh
  3. 1 1
      packaging/docker/Dockerfile
  4. 1 1
      packaging/rpm/Dockerfile

+ 1 - 1
Makefile

@@ -1,6 +1,6 @@
 APP          := miniflux
 DOCKER_IMAGE := miniflux/miniflux
-VERSION      := $(shell git describe --abbrev=0)
+VERSION      := $(shell git describe --tags --abbrev=0)
 COMMIT       := $(shell git rev-parse --short HEAD)
 BUILD_DATE   := `date +%FT%T%z`
 LD_FLAGS     := "-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.Commit=$(COMMIT)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'"

+ 1 - 1
packaging/debian/build.sh

@@ -2,7 +2,7 @@
 
 PKG_ARCH=`dpkg --print-architecture`
 PKG_DATE=`date -R`
-PKG_VERSION=`cd /src && git describe --abbrev=0`
+PKG_VERSION=`cd /src && git describe --tags --abbrev=0`
 
 echo "PKG_VERSION=$PKG_VERSION"
 echo "PKG_ARCH=$PKG_ARCH"

+ 1 - 1
packaging/docker/Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /go/src/app
 RUN go generate
 RUN go build \
     -o miniflux \
-    -ldflags="-s -w -X 'miniflux.app/version.Version=`git describe --abbrev=0`' -X 'miniflux.app/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/version.BuildDate=`date +%FT%T%z`'" \
+    -ldflags="-s -w -X 'miniflux.app/version.Version=`git describe --tags --abbrev=0`' -X 'miniflux.app/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/version.BuildDate=`date +%FT%T%z`'" \
     main.go
 
 FROM alpine:latest

+ 1 - 1
packaging/rpm/Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /go/src/app
 RUN go generate
 RUN go build \
     -o miniflux \
-    -ldflags="-s -w -X 'miniflux.app/version.Version=`git describe --abbrev=0`' -X 'miniflux.app/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/version.BuildDate=`date +%FT%T%z`'" \
+    -ldflags="-s -w -X 'miniflux.app/version.Version=`git describe --tags --abbrev=0`' -X 'miniflux.app/version.Commit=`git rev-parse --short HEAD`' -X 'miniflux.app/version.BuildDate=`date +%FT%T%z`'" \
     main.go
 
 FROM centos:latest