From f941347cf189387b0bca8c9cac7c747e343b5b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Wed, 9 Aug 2023 11:39:49 -0400 Subject: [PATCH] Upgrade to Go 1.21 (#2475) * Upgrade to Go 1.21 * Remove 'replacements' from goreleaser config --- .devcontainer/devcontainer.json | 2 +- .github/workflows/pipeline.yml | 12 ++++++------ .golangci.yml | 2 +- .goreleaser.yml | 6 ------ Makefile | 2 +- go.mod | 2 +- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bb56b4e2..ffabb013 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "dockerfile": "Dockerfile", "args": { // Update the VARIANT arg to pick a version of Go: 1, 1.15, 1.14 - "VARIANT": "1.20", + "VARIANT": "1.21", // Options "INSTALL_NODE": "true", "NODE_VERSION": "v18" diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index f4c386ed..86496366 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -16,10 +16,10 @@ jobs: - name: Install taglib run: sudo apt-get install libtag1-dev - - name: Set up Go 1.20 + - name: Set up Go 1.21 uses: actions/setup-go@v3 with: - go-version: 1.20.x + go-version: 1.21.x - uses: actions/checkout@v3 @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go_version: [1.20.x,1.19.x] + go_version: [1.21.x,1.20.x] steps: - name: Install taglib run: sudo apt-get install libtag1-dev @@ -126,7 +126,7 @@ jobs: path: ui/build - name: Config /github/workspace folder as trusted - uses: docker://deluan/ci-goreleaser:1.20.3-1 + uses: docker://deluan/ci-goreleaser:1.21.0-1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -134,7 +134,7 @@ jobs: - name: Run GoReleaser - SNAPSHOT if: startsWith(github.ref, 'refs/tags/') != true - uses: docker://deluan/ci-goreleaser:1.20.3-1 + uses: docker://deluan/ci-goreleaser:1.21.0-1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -142,7 +142,7 @@ jobs: - name: Run GoReleaser - RELEASE if: startsWith(github.ref, 'refs/tags/') - uses: docker://deluan/ci-goreleaser:1.20.3-1 + uses: docker://deluan/ci-goreleaser:1.21.0-1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.golangci.yml b/.golangci.yml index e7836b4c..f9a2caf8 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,5 @@ run: - go: "1.19" + go: "1.20" linters: enable: diff --git a/.goreleaser.yml b/.goreleaser.yml index 1679f3f0..28f00c74 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -116,12 +116,6 @@ archives: - format_overrides: - goos: windows format: zip - replacements: - darwin: macOS - linux: Linux - windows: Windows - 386: i386 - amd64: x86_64 checksum: name_template: "{{ .ProjectName }}_checksums.txt" diff --git a/Makefile b/Makefile index f9cc804d..c8d996f0 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.20.3-1 ## https://github.com/navidrome/ci-goreleaser +CI_RELEASER_VERSION=1.21.0-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... diff --git a/go.mod b/go.mod index 603864d3..161f53b1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/navidrome/navidrome -go 1.19 +go 1.20 require ( code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee