Merge branch 'develop'

l3uddz · Jun 14, 2020 · 063be1e · 063be1e
2 parents 97009e8 + aae9561
commit 063be1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -17,9 +17,9 @@ builds:
       - amd64
     ldflags:
       - -s -w
-      - -X "github.com/l3uddz/mediarr/build.Version={{ .Version }}"
-      - -X "github.com/l3uddz/mediarr/build.GitCommit={{ .ShortCommit }}"
-      - -X "github.com/l3uddz/mediarr/build.Timestamp={{ .Timestamp }}"
+      - -X "github.com/l3uddz/mediarr/release.Version={{ .Version }}"
+      - -X "github.com/l3uddz/mediarr/release.GitCommit={{ .ShortCommit }}"
+      - -X "github.com/l3uddz/mediarr/release.Timestamp={{ .Timestamp }}"
     flags:
       - -trimpath
 
@@ -33,9 +33,9 @@ builds:
       - -linkmode external
       - -extldflags -static
       - -s -w
-      - -X "github.com/l3uddz/mediarr/build.Version={{ .Version }}"
-      - -X "github.com/l3uddz/mediarr/build.GitCommit={{ .ShortCommit }}"
-      - -X "github.com/l3uddz/mediarr/build.Timestamp={{ .Timestamp }}"
+      - -X "github.com/l3uddz/mediarr/release.Version={{ .Version }}"
+      - -X "github.com/l3uddz/mediarr/release.GitCommit={{ .ShortCommit }}"
+      - -X "github.com/l3uddz/mediarr/release.Timestamp={{ .Timestamp }}"
     flags:
       - -trimpath
       - -tags=netgo
@@ -52,9 +52,9 @@ builds:
       - amd64
     ldflags:
       - -s -w
-      - -X "github.com/l3uddz/mediarr/build.Version={{ .Version }}"
-      - -X "github.com/l3uddz/mediarr/build.GitCommit={{ .ShortCommit }}"
-      - -X "github.com/l3uddz/mediarr/build.Timestamp={{ .Timestamp }}"
+      - -X "github.com/l3uddz/mediarr/release.Version={{ .Version }}"
+      - -X "github.com/l3uddz/mediarr/release.GitCommit={{ .ShortCommit }}"
+      - -X "github.com/l3uddz/mediarr/release.Timestamp={{ .Timestamp }}"
     flags:
       - -trimpath
 

diff --git a/Makefile b/Makefile
@@ -54,7 +54,7 @@ ${BUILD_PATH}/${CMD}: ${GO_FILES} go.sum
 	CGO_ENABLED=${CGO} go build \
 		-mod vendor \
 		-trimpath \
-		-ldflags "-s -w -X github.com/l3uddz/mediarr/build.Version=${VERSION} -X github.com/l3uddz/mediarr/build.GitCommit=${GIT_COMMIT} -X github.com/l3uddz/mediarr/build.Timestamp=${TIMESTAMP}" \
+		-ldflags "-s -w -X github.com/l3uddz/mediarr/release.Version=${VERSION} -X github.com/l3uddz/mediarr/release.GitCommit=${GIT_COMMIT} -X github.com/l3uddz/mediarr/release.Timestamp=${TIMESTAMP}" \
 		-o ${BUILD_PATH}/${CMD} \
 		.