Skip to content

Commit d3d2d42

Browse files
committed
chore: upgrade to Go 1.22
1 parent 34b23ee commit d3d2d42

File tree

4 files changed

+14
-65
lines changed

4 files changed

+14
-65
lines changed

.github/workflows/golangci-lint.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,17 @@ jobs:
2020
- uses: actions/setup-go@v5
2121
with:
2222
go-version-file: go.mod
23+
- name: Determine golangci-lint version
24+
id: golangcilint
25+
run: |
26+
line=$(grep GOLANGCI_LINT_VERSION= Makefile)
27+
version=$(echo ${line} | cut -d = -f2)
28+
echo "version=$version" >> "$GITHUB_OUTPUT"
2329
- name: golangci-lint
2430
uses: golangci/golangci-lint-action@v3
2531
with:
2632
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
27-
version: v1.49
33+
version: ${{ steps.golangcilint.outputs.version }}
2834

2935
# Optional: working directory, useful for monorepos
3036
# working-directory: somedir

Makefile

+6-18
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@ PLATFORMS?=darwin linux windows freebsd
2020
ARCHITECTURES?=amd64 arm64
2121
GOBIN?=$(shell go env GOPATH)/bin
2222
FORMATTER?=$(GOBIN)/goimports
23-
GO_INSTALL = ./hack/go_install.sh
24-
TOOLS_DIR := hack/tools
25-
TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/bin)
2623

27-
28-
# Binaries.
29-
GOLANGCI_LINT_VER := v1.49
30-
GOLANGCI_LINT_BIN := golangci-lint
31-
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
24+
CRI=docker
25+
CRI_COMMAND_BASE=${CRI} run --rm -u ${CURRENT_UID}:${CURRENT_GID} $(DOCKER_EXTRA_ARGS)
26+
GOLANGCI_LINT_VERSION=v1.56
27+
GOLANGCI_LINT_IMAGE=golangci/golangci-lint:${GOLANGCI_LINT_VERSION}
28+
GOLANGCI_LINT=${CRI_COMMAND_BASE} -v $(CURDIR):/app -w /app -e GOLANGCI_LINT_CACHE=/tmp/.cache -e GOCACHE=/tmp/.cache ${GOLANGCI_LINT_IMAGE} golangci-lint
3229

3330
# Setup linker flags option for build that interoperate with variable names in src code
3431
LDFLAGS?=-ldflags "-X $(PACKAGE_NAME)/cmd.Version=$(VERSION) -X $(PACKAGE_NAME)/cmd.Build=$(BUILD)"
@@ -42,7 +39,7 @@ fmt: $(FORMATTER)
4239
$(FORMATTER):
4340
go get golang.org/x/tools/cmd/goimports
4441

45-
lint: $(GOLANGCI_LINT) ## Lint codebase
42+
lint: ## Lint codebase
4643
$(GOLANGCI_LINT) run -v --fast=false
4744

4845
build:
@@ -69,12 +66,3 @@ generate-docs: clean-docs
6966

7067
test:
7168
go test -v ./... -timeout 1000s
72-
73-
74-
## --------------------------------------
75-
## Tooling Binaries
76-
## --------------------------------------
77-
78-
$(GOLANGCI_LINT): ## Build golangci-lint from tools folder.
79-
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
80-
golangci-lint: $(LINTER)

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/equinix/metal-cli
22

3-
go 1.19
3+
go 1.22
44

55
require (
66
github.com/equinix/equinix-sdk-go v0.39.1

hack/go_install.sh

-45
This file was deleted.

0 commit comments

Comments
 (0)