Skip to content

Commit

Permalink
Upgrade to Go 1.21 (#2475)
Browse files Browse the repository at this point in the history
* Upgrade to Go 1.21

* Remove 'replacements' from goreleaser config
  • Loading branch information
deluan authored Aug 9, 2023
1 parent 1b5cefd commit f941347
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -126,23 126,23 @@ 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:
args: /bin/bash -c "git config --global --add safe.directory /github/workspace; git describe --dirty --always --tags"

- 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:
args: goreleaser release --rm-dist --skip-publish --snapshot

- 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:
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,5 1,5 @@
run:
go: "1.19"
go: "1.20"

linters:
enable:
Expand Down
6 changes: 0 additions & 6 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit f941347

Please sign in to comment.