From 3a462c7f07bbef5b25cf97f2f9e84ed04679a89d Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 7 Nov 2022 17:16:30 -0500 Subject: [PATCH] Fix ARM v5 and v6 builds, by going back to armel. Also upgrades Go to 1.19.3. Closes #1968 --- .github/workflows/pipeline.yml | 4 ++-- .goreleaser.yml | 14 +++++++------- Makefile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 2d64e5d0..e2f756b6 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -141,7 +141,7 @@ jobs: - name: Run GoReleaser - SNAPSHOT if: startsWith(github.ref, 'refs/tags/') != true - uses: docker://deluan/ci-goreleaser:1.19.1-3 + uses: docker://deluan/ci-goreleaser:1.19.3-1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -149,7 +149,7 @@ jobs: - name: Run GoReleaser - RELEASE if: startsWith(github.ref, 'refs/tags/') - uses: docker://deluan/ci-goreleaser:1.19.1-3 + uses: docker://deluan/ci-goreleaser:1.19.3-1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.goreleaser.yml b/.goreleaser.yml index 4f2a6d4d..232069b0 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -22,7 +22,7 @@ builds: goos: - linux goarch: - - 386 + - "386" flags: - -tags=embed,netgo ldflags: @@ -32,17 +32,17 @@ builds: - id: navidrome_linux_arm env: - CGO_ENABLED=1 - - CC=arm-linux-gnueabihf-gcc - - CXX=arm-linux-gnueabihf-g++ + - CC=arm-linux-gnueabi-gcc + - CXX=arm-linux-gnueabi-g++ - PKG_CONFIG_PATH=/arm/lib/pkgconfig goos: - linux goarch: - arm goarm: - - 5 - - 6 - - 7 + - "5" + - "6" + - "7" flags: - -tags=embed,netgo ldflags: @@ -74,7 +74,7 @@ builds: goos: - windows goarch: - - 386 + - "386" flags: - -tags=embed,netgo ldflags: diff --git a/Makefile b/Makefile index 0fb2f8a4..24faefda 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.19.1-3 ## https://github.com/navidrome/ci-goreleaser +CI_RELEASER_VERSION=1.19.3-1 ## 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...