Merge pull request #162 from tonistiigi/tonistiigi/go-1.20

update to Go 1.20
tonistiigi · Jun 29, 2023 · 36ef4d8 · 36ef4d8
2 parents 171984c + d384523
commit 36ef4d8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        GO_VERSION: ["1.18", "1.19"]
+        GO_VERSION: ["1.19", "1.20"]
     env:
       GO_VERSION: ${{ matrix.GO_VERSION }}
     steps:
@@ -53,8 +53,8 @@ jobs:
       fail-fast: false
       matrix:
         go:
-          - 1.18
-          - 1.19
+          - "1.19"
+          - "1.20"
     steps:
       -
         name: Checkout

diff --git a/.golangci.yml b/.golangci.yml
@@ -7,14 +7,10 @@ linters:
   enable:
     - gofmt
     - govet
-    - deadcode
     - goimports
     - ineffassign
     - misspell
     - unused
-    - varcheck
-    - golint
     - staticcheck
     - typecheck
-    - structcheck
   disable-all: true
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 #syntax=docker/dockerfile:1
-ARG GO_VERSION=1.18
+ARG GO_VERSION=1.20
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.1.0 AS xx
 

diff --git a/bench/go.mod b/bench/go.mod
@@ -1,6 +1,6 @@
 module github.com/tonistiigi/fsutil/bench
 
-go 1.18
+go 1.19
 
 require (
 	github.com/containerd/continuity v0.3.1-0.20230206214859-2a963a2f56e8

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-  default = "1.18"
+  default = "1.20"
 }
 
 group "default" {

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/tonistiigi/fsutil
 
-go 1.18
+go 1.19
 
 require (
 	github.com/Microsoft/go-winio v0.5.2

diff --git a/hack/dockerfiles/gomod.Dockerfile b/hack/dockerfiles/gomod.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG GO_VERSION=1.18
+ARG GO_VERSION=1.20
 
 FROM golang:${GO_VERSION}-alpine AS gomod
 RUN  apk add --no-cache git

diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1
-ARG GO_VERSION=1.18
+ARG GO_VERSION=1.20
 
 FROM golang:${GO_VERSION}-alpine
 RUN apk add --no-cache git gcc musl-dev
-RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.49.0
+RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.53.3
 WORKDIR /go/src/github.com/tonistiigi/fsutil
 RUN --mount=target=/go/src/github.com/tonistiigi/fsutil --mount=target=/root/.cache,type=cache --mount=target=/go/pkg/mod,type=cache \
   golangci-lint run