From bdd4ae13def30e62f0e66d83f0ce107888b22a05 Mon Sep 17 00:00:00 2001 From: Ryota Arai Date: Tue, 21 Nov 2023 13:42:40 +0000 Subject: [PATCH 1/2] Upgrade go to v1.21 --- .github/actions/release/action.yaml | 2 +- .github/workflows/ci.yaml | 6 +++--- .github/workflows/publish_dev_image.yaml | 2 +- Makefile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/release/action.yaml b/.github/actions/release/action.yaml index c3f3b23..f0fc599 100644 --- a/.github/actions/release/action.yaml +++ b/.github/actions/release/action.yaml @@ -23,7 +23,7 @@ runs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: ~1.16 + go-version: ~1.21 - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e5afaf5..64af2df 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,7 +20,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ~1.16 + go-version: ~1.21 id: go - name: Get dependencies run: go mod download @@ -38,7 +38,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ~1.16 + go-version: ~1.21 id: go - name: Get dependencies run: go mod download @@ -60,7 +60,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ~1.16 + go-version: ~1.21 id: go - name: Validate GoReleaser uses: goreleaser/goreleaser-action@v3 diff --git a/.github/workflows/publish_dev_image.yaml b/.github/workflows/publish_dev_image.yaml index 10659e4..046964e 100644 --- a/.github/workflows/publish_dev_image.yaml +++ b/.github/workflows/publish_dev_image.yaml @@ -18,7 +18,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ~1.16 + go-version: ~1.21 id: go - name: Login to GitHub Container Registry uses: docker/login-action@v2 diff --git a/Makefile b/Makefile index 094c97b..3067a40 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,9 @@ OUTDIR ?= ./dist setup: npm install --prefix=.dev markdown-toc && \ cd $(shell go env GOPATH) && \ - go get -u golang.org/x/tools/cmd/goimports && \ + go install golang.org/x/tools/cmd/goimports@latest && \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.27.0 && \ - go get -u github.com/elastic/go-licenser + go install github.com/elastic/go-licenser@latest .PHONY: fmt From 6a61ef94890abf6a36605296ed90af130753525c Mon Sep 17 00:00:00 2001 From: Ryota Arai Date: Tue, 21 Nov 2023 13:57:44 +0000 Subject: [PATCH 2/2] Install golangci-lint v1.55.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3067a40..929bf47 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ setup: npm install --prefix=.dev markdown-toc && \ cd $(shell go env GOPATH) && \ go install golang.org/x/tools/cmd/goimports@latest && \ - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.27.0 && \ + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.55.2 && \ go install github.com/elastic/go-licenser@latest