From 6a6d4c3f8735612fe5a652a63c9bae9e86618ff8 Mon Sep 17 00:00:00 2001 From: Deluan Date: Sun, 30 Aug 2020 10:55:04 -0400 Subject: [PATCH] Use new ci-releaser image, that contains static `taglib` library --- .github/workflows/pipeline.yml | 4 ++-- .goreleaser.yml | 12 +++++++++--- Makefile | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 7362f0a3..84b471b6 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -114,7 +114,7 @@ jobs: - name: Run GoReleaser - SNAPSHOT if: startsWith(github.ref, 'refs/tags/') != true - uses: docker://deluan/ci-goreleaser:1.14.4-3 + uses: docker://deluan/ci-goreleaser:1.14.7-1-taglib env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -122,7 +122,7 @@ jobs: - name: Run GoReleaser - RELEASE if: startsWith(github.ref, 'refs/tags/') - uses: docker://deluan/ci-goreleaser:1.14.4-3 + uses: docker://deluan/ci-goreleaser:1.14.7-1-taglib env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.goreleaser.yml b/.goreleaser.yml index 90d0726a..0d9879b5 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -12,6 +12,7 @@ builds: - CGO_ENABLED=1 - CC=o64-clang - CXX=o64-clang++ + - PKG_CONFIG_PATH=/darwin/lib/pkgconfig goos: - darwin goarch: @@ -31,12 +32,13 @@ builds: flags: - -tags=embed ldflags: - - "-extldflags '-static'" + - "-extldflags '-static -lz'" - -s -w -X github.com/deluan/navidrome/consts.gitSha={{.ShortCommit}} -X github.com/deluan/navidrome/consts.gitTag={{.Version}} - id: navidrome_linux_386 env: - CGO_ENABLED=1 +# - PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig goos: - linux goarch: @@ -50,7 +52,8 @@ builds: - id: navidrome_linux_arm env: - CGO_ENABLED=1 - - CC=arm-linux-gnueabi-gcc-5 + - CC=arm-linux-gnueabihf-gcc + - CXX=arm-linux-gnueabihf-g++ goos: - linux goarch: @@ -68,7 +71,8 @@ builds: - id: navidrome_linux_arm64 env: - CGO_ENABLED=1 - - CC=aarch64-linux-gnu-gcc-5 + - CC=aarch64-linux-gnu-gcc + - CXX=aarch64-linux-gnu-g++ goos: - linux goarch: @@ -84,6 +88,7 @@ builds: - CGO_ENABLED=1 - CC=i686-w64-mingw32-gcc - CXX=i686-w64-mingw32-g++ + - PKG_CONFIG_PATH=/mingw32/lib/pkgconfig goos: - windows goarch: @@ -99,6 +104,7 @@ builds: - CGO_ENABLED=1 - CC=x86_64-w64-mingw32-gcc - CXX=x86_64-w64-mingw32-g++ + - PKG_CONFIG_PATH=/mingw64/lib/pkgconfig goos: - windows goarch: diff --git a/Makefile b/Makefile index d9ef61b3..e8252780 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.4-3 goreleaser release --rm-dist --skip-publish --snapshot + docker run -it -v $(PWD):/workspace -w /workspace deluan/ci-goreleaser:1.14.7-1-taglib goreleaser release --rm-dist --skip-publish --snapshot .PHONY: snapshot