From 669f293f1f8338800363d996a2493e4555b7c8d8 Mon Sep 17 00:00:00 2001 From: Deluan Date: Thu, 10 Sep 2020 17:49:25 -0400 Subject: [PATCH] Fix ci-goreleaser --- .github/workflows/pipeline.yml | 4 ++-- .goreleaser.yml | 30 +++++++++++++++--------------- Makefile | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index b59da65c..997e6eb5 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -115,7 +115,7 @@ jobs: - name: Run GoReleaser - SNAPSHOT if: startsWith(github.ref, 'refs/tags/') != true - uses: docker://deluan/ci-goreleaser:1.14.9-2 + uses: docker://deluan/ci-goreleaser:1.14.9-3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -123,7 +123,7 @@ jobs: - name: Run GoReleaser - RELEASE if: startsWith(github.ref, 'refs/tags/') - uses: docker://deluan/ci-goreleaser:1.14.9-2 + uses: docker://deluan/ci-goreleaser:1.14.9-3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.goreleaser.yml b/.goreleaser.yml index f74f9b88..ad725cb1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -7,21 +7,6 @@ before: - go-bindata -fs -prefix ui/build -tags embed -nocompress -pkg assets -o assets/embedded_gen.go ui/build/... builds: - - id: navidrome_darwin - env: - - CGO_ENABLED=1 - - CC=o64-clang - - CXX=o64-clang++ - - PKG_CONFIG_PATH=/darwin/lib/pkgconfig - goos: - - darwin - goarch: - - amd64 - flags: - - -tags=embed - ldflags: - - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} - - id: navidrome_linux_amd64 env: - CGO_ENABLED=1 @@ -114,6 +99,21 @@ builds: - "-extldflags '-static'" - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} + - id: navidrome_darwin + env: + - CGO_ENABLED=1 + - CC=o64-clang + - CXX=o64-clang++ + - PKG_CONFIG_PATH=/darwin/lib/pkgconfig + goos: + - darwin + goarch: + - amd64 + flags: + - -tags=embed + ldflags: + - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} + archives: - format_overrides: - goos: windows diff --git a/Makefile b/Makefile index e781c06c..afec28da 100644 --- a/Makefile +++ b/Makefile @@ -96,5 +96,5 @@ release: .PHONY: release snapshot: - docker run -it -v $(PWD):/workspace -w /workspace deluan/ci-goreleaser:1.14.9-2 goreleaser release --rm-dist --skip-publish --snapshot + docker run -it -v $(PWD):/workspace -w /workspace deluan/ci-goreleaser:1.14.9-3 goreleaser release --rm-dist --skip-publish --snapshot .PHONY: snapshot