fix gitlab cd

bearchess · Sep 25, 2022 · 0fa74c4 · 0fa74c4
1 parent 072fe53
commit 0fa74c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -18,7 +18,7 @@ builds:
     goos:
       - linux
     ldflags:
-      - -s -w -X go-musicfox/pkg/constants.AppVersion={{.Tag}} -X go-musicfox/pkg/constants.LastfmKey={{ .Env.HOMEBREW_TAP_TOKEN }} -X go-musicfox/pkg/constants.LastfmSecret={{ .Env.HOMEBREW_TAP_TOKEN }}
+      - -s -w -X go-musicfox/pkg/constants.AppVersion={{.Tag}} -X go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
 #  - id: go-musicfox-linux-arm64
 #    binary: musicfox
 #    hooks:
@@ -40,7 +40,7 @@ builds:
     goos:
       - windows
     ldflags:
-      - -s -w -X go-musicfox/pkg/constants.AppVersion={{.Tag}} -X go-musicfox/pkg/constants.LastfmKey={{ .Env.HOMEBREW_TAP_TOKEN }} -X go-musicfox/pkg/constants.LastfmSecret={{ .Env.HOMEBREW_TAP_TOKEN }}
+      - -s -w -X go-musicfox/pkg/constants.AppVersion={{.Tag}} -X go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
     env:
       - CC=x86_64-w64-mingw32-gcc
       - CXX=x86_64-w64-mingw32-g++
@@ -52,7 +52,7 @@ builds:
     goos:
       - darwin
     ldflags:
-      - -s -w -X go-musicfox/pkg/constants.AppVersion={{.Tag}} -X go-musicfox/pkg/constants.LastfmKey={{ .Env.HOMEBREW_TAP_TOKEN }} -X go-musicfox/pkg/constants.LastfmSecret={{ .Env.HOMEBREW_TAP_TOKEN }}
+      - -s -w -X go-musicfox/pkg/constants.AppVersion={{.Tag}} -X go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
     env:
       - CC=oa64-clang
       - CXX=oa64-clang++
@@ -64,7 +64,7 @@ builds:
     goos:
       - darwin
     ldflags:
-      - -s -w -X go-musicfox/pkg/constants.AppVersion={{.Tag}} -X go-musicfox/pkg/constants.LastfmKey={{ .Env.HOMEBREW_TAP_TOKEN }} -X go-musicfox/pkg/constants.LastfmSecret={{ .Env.HOMEBREW_TAP_TOKEN }}
+      - -s -w -X go-musicfox/pkg/constants.AppVersion={{.Tag}} -X go-musicfox/pkg/constants.LastfmKey={{.Env.LASTFM_KEY}} -X go-musicfox/pkg/constants.LastfmSecret={{.Env.LASTFM_SECRET}}
     env:
       - CC=o64-clang
       - CXX=o64-clang++

diff --git a/Makefile b/Makefile
@@ -18,6 +18,7 @@ release-dry-run:
 		--rm \
 		--privileged \
 		-e CGO_ENABLED=1 \
+		--env-file .release-env \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-v `pwd`/sysroot:/sysroot \