From 6f4c55dbde2c94a994be99f630258cf5cd0a6979 Mon Sep 17 00:00:00 2001 From: Deluan Date: Sat, 17 Feb 2024 11:16:54 -0500 Subject: [PATCH] Use new ci-goreleaser (with TagLib 2) --- .github/workflows/pipeline.yml | 6 +++--- Makefile | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index f1b4ee97..d4f2d1b6 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -132,7 +132,7 @@ jobs: path: ui/build - name: Config /github/workspace folder as trusted - uses: docker://deluan/ci-goreleaser:1.22.0-1 + uses: docker://deluan/ci-goreleaser:1.22.0-2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -140,7 +140,7 @@ jobs: - name: Run GoReleaser - SNAPSHOT if: startsWith(github.ref, 'refs/tags/') != true - uses: docker://deluan/ci-goreleaser:1.22.0-1 + uses: docker://deluan/ci-goreleaser:1.22.0-2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -148,7 +148,7 @@ jobs: - name: Run GoReleaser - RELEASE if: startsWith(github.ref, 'refs/tags/') - uses: docker://deluan/ci-goreleaser:1.22.0-1 + uses: docker://deluan/ci-goreleaser:1.22.0-2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/Makefile b/Makefile index e8481a6f..d87f7b15 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ GIT_SHA=source_archive GIT_TAG=$(patsubst navidrome-%,v%,$(notdir $(PWD))) endif -CI_RELEASER_VERSION=1.22.0-1 ## https://github.com/navidrome/ci-goreleaser +CI_RELEASER_VERSION=1.22.0-2 ## https://github.com/navidrome/ci-goreleaser setup: check_env download-deps setup-git ##@1_Run_First Install dependencies and prepare development environment @echo Downloading Node dependencies... @@ -94,6 +94,7 @@ buildjs: check_node_env ##@Build Build only frontend .PHONY: buildjs all: warning-noui-build ##@Cross_Compilation Build binaries for all supported platforms. It does not build the frontend + @echo "Building binaries for all platforms using builder ${CI_RELEASER_VERSION}" docker run -t -v $(PWD):/workspace -w /workspace deluan/ci-goreleaser:$(CI_RELEASER_VERSION) \ goreleaser release --clean --skip=publish --snapshot .PHONY: all @@ -105,9 +106,9 @@ single: warning-noui-build ##@Cross_Compilation Build binaries for a single supp grep -- "- id: navidrome_" .goreleaser.yml | sed 's/- id: navidrome_//g'; \ exit 1; \ fi - @echo "Building binaries for ${GOOS}/${GOARCH}" + @echo "Building binaries for ${GOOS}/${GOARCH} using builder ${CI_RELEASER_VERSION}" docker run -t -v $(PWD):/workspace -e GOOS -e GOARCH -w /workspace deluan/ci-goreleaser:$(CI_RELEASER_VERSION) \ - goreleaser build --clean --snapshot --single-target --id navidrome_${GOOS}_${GOARCH} + goreleaser build --clean --snapshot -p 2 --single-target --id navidrome_${GOOS}_${GOARCH} .PHONY: single warning-noui-build: