feat: migrate to go 1.18

Increase go.mod version from 1.17 to 1.18 in all projects. Update Makefile to use latest tooling. Fix golangci by disable nolintlint for now. Signed-off-by: Dmitriy Matrenichev <[email protected]>
siderolabs · Apr 11, 2022 · a7ba7ea · a7ba7ea
1 parent 9dace93
commit a7ba7ea
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -3,6 +3,7 @@
 
 # options for analysis running
 run:
+  go: '1.18'
   # default concurrency is a available CPU number
   # concurrency: 4
 
@@ -155,6 +156,7 @@ linters:
     - maintidx
     - nestif
     - nilnil # we return "nil, nil"
+    - nolintlint
     - paralleltest
     - promlinter # https://github.com/golangci/golangci-lint/issues/2222
     - tagliatelle # we have many different conventions

diff --git a/Makefile b/Makefile
@@ -13,18 +13,18 @@ DOCKER_LOGIN_ENABLED ?= true
 NAME = Talos
 
 ARTIFACTS := _out
-TOOLS ?= ghcr.io/siderolabs/tools:v1.1.0-alpha.0-1-g99be089
+TOOLS ?= ghcr.io/siderolabs/tools:v1.1.0-alpha.0-7-g718ec10
 PKGS ?= v1.1.0-alpha.0-20-g415020f
 EXTRAS ?= v1.1.0-alpha.0
-GO_VERSION ?= 1.17
+GO_VERSION ?= 1.18
 GOIMPORTS_VERSION ?= v0.1.10
 GOFUMPT_VERSION ?= v0.3.0
-GOLANGCILINT_VERSION ?= v1.45.0
-STRINGER_VERSION ?= v0.1.5
+GOLANGCILINT_VERSION ?= v1.45.2
+STRINGER_VERSION ?= v0.1.10
 ENUMER_VERSION ?= v1.1.2
 DEEPCOPY_GEN_VERSION ?= v0.21.3
 VTPROTOBUF_VERSION ?= v0.2.0
-IMPORTVET ?= ghcr.io/siderolabs/importvet:c9424fe
+IMPORTVET ?= ghcr.io/siderolabs/importvet:1549a5c
 OPERATING_SYSTEM := $(shell uname -s | tr "[:upper:]" "[:lower:]")
 TALOSCTL_DEFAULT_TARGET := talosctl-$(OPERATING_SYSTEM)
 INTEGRATION_TEST_DEFAULT_TARGET := integration-test-$(OPERATING_SYSTEM)

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/talos-systems/talos
 
-go 1.17
+go 1.18
 
 replace (
 	// Use nested module.

diff --git a/hack/cloud-image-uploader/go.mod b/hack/cloud-image-uploader/go.mod
@@ -1,6 +1,6 @@
 module github.com/talos-systems/cloud-image-uploader
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aws/aws-sdk-go v1.43.31

diff --git a/hack/docgen/go.mod b/hack/docgen/go.mod
@@ -1,6 +1,6 @@
 module github.com/talos-systems/talos-hack-docgen
 
-go 1.17
+go 1.18
 
 // forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes
 // which are then encoded as a valid YAML blocks with proper indentiation

diff --git a/pkg/machinery/go.mod b/pkg/machinery/go.mod
@@ -1,6 +1,6 @@
 module github.com/talos-systems/talos/pkg/machinery
 
-go 1.17
+go 1.18
 
 // forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes
 // which are then encoded as a valid YAML blocks with proper indentiation