From b466ec75a4a535c17257ee98a693ec7b2d15cdf7 Mon Sep 17 00:00:00 2001
From: Deluan <deluan@deluan.com>
Date: Wed, 18 Mar 2020 20:46:11 -0400
Subject: [PATCH] build: always add latest tag to version
---
.goreleaser.yml | 28 ++++++++++++++--------------
Dockerfile | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.goreleaser.yml b/.goreleaser.yml
index f3d937051..fcfb044f7 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -9,6 +9,20 @@ before:
- git checkout .
builds:
+ - id: navidrome_darwin
+ env:
+ - CGO_ENABLED=1
+ - CC=o64-clang
+ - CXX=o64-clang++
+ goos:
+ - darwin
+ goarch:
+ - amd64
+ flags:
+ - -tags=embed
+ ldflags:
+ - -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Tag}}
+
- id: navidrome_linux_amd64
env:
- CGO_ENABLED=1
@@ -54,20 +68,6 @@ builds:
- "-extldflags '-static'"
- -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Tag}}
- - id: navidrome_darwin
- env:
- - CGO_ENABLED=1
- - CC=o64-clang
- - CXX=o64-clang++
- goos:
- - darwin
- goarch:
- - amd64
- flags:
- - -tags=embed
- ldflags:
- - -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Tag}}
-
- id: navidrome_windows_i686
env:
- CGO_ENABLED=1
diff --git a/Dockerfile b/Dockerfile
index 7bcac4512..eaa36351c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ COPY --from=jsbuilder /src/build/* /src/ui/build/
COPY --from=jsbuilder /src/build/static/css/* /src/ui/build/static/css/
COPY --from=jsbuilder /src/build/static/js/* /src/ui/build/static/js/
RUN rm -rf /src/build/css /src/build/js
-RUN GIT_TAG=$(git name-rev --name-only HEAD) && \
+RUN GIT_TAG=$(git describe --tags `git rev-list --tags --max-count=1`) && \
GIT_TAG=${GIT_TAG#"tags/"} && \
GIT_SHA=$(git rev-parse --short HEAD) && \
echo "Building version: ${GIT_TAG} (${GIT_SHA})" && \