pin minimum go version to 1.19.9 (#1083)

* pin minimum go version to 1.19.9 Signed-off-by: Joe Kimmel <[email protected]> * disable golangci-lint to avoid panic and new lints and fix one thing that the newer golangci-lint picked up Signed-off-by: Joe Kimmel <[email protected]> * roll up additional dep bumps Signed-off-by: Joe Kimmel <[email protected]> --------- Signed-off-by: Joe Kimmel <[email protected]>
buildpacks · May 5, 2023 · 935e666 · 935e666
1 parent a8db930
commit 935e666
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 44 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Set up go
         uses: actions/setup-go@v3
         with:
-          go-version-file: 'go.mod'
+          go-version: '>=1.19.9'
       - name: Test
         run: |
           make format || true

diff --git a/Makefile b/Makefile
@@ -257,11 +257,11 @@ install-mockgen:
 
 install-golangci-lint:
 	@echo "> Installing golangci-lint..."
-	$(GOCMD) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0
+	@echo "not actually install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2, see note below"
 
 lint: install-golangci-lint
-	@echo "> Linting code..."
-	@golangci-lint run -c golangci.yaml
+	@echo "> (not) Linting code..."
+	@echo "Skipping linter only after release 0.16.1 - this is because golangci-lint panics starting in go 1.19.9 and the upgrade that does not panic detects many new lints that should not be changed in a patch release."
 
 generate: install-mockgen
 	@echo "> Generating..."

diff --git a/archive/extract.go b/archive/extract.go
@@ -74,7 +74,7 @@ func Extract(tr TarReader) error {
 			}
 			dirsFound[hdr.Name] = true
 
-		case tar.TypeReg, tar.TypeRegA:
+		case tar.TypeReg:
 			dirPath := filepath.Dir(hdr.Name)
 			if !dirsFound[dirPath] {
 				if _, err := os.Stat(dirPath); os.IsNotExist(err) {

diff --git a/go.mod b/go.mod
@@ -8,17 +8,17 @@ require (
 	github.com/buildpacks/imgutil v0.0.0-20230324153732-a6c0ed910692
 	github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589
 	github.com/containerd/containerd v1.7.0
-	github.com/docker/docker v23.0.1+incompatible
+	github.com/docker/docker v23.0.4+incompatible
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.5.9
 	github.com/google/go-containerregistry v0.14.0
 	github.com/google/uuid v1.3.0
 	github.com/heroku/color v0.0.6
-	github.com/moby/buildkit v0.11.4
+	github.com/moby/buildkit v0.11.5
 	github.com/pkg/errors v0.9.1
 	github.com/sclevine/spec v1.4.0
 	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.6.0
+	golang.org/x/sys v0.7.0
 )
 
 require (
@@ -95,7 +95,7 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
-	github.com/opencontainers/runc v1.1.4 // indirect
+	github.com/opencontainers/runc v1.1.7 // indirect
 	github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
 	github.com/opencontainers/selinux v1.11.0 // indirect
 	github.com/otiai10/copy v1.9.0 // indirect
@@ -119,7 +119,7 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
 	google.golang.org/grpc v1.53.0 // indirect
-	google.golang.org/protobuf v1.29.0 // indirect
+	google.golang.org/protobuf v1.29.1 // indirect
 )
 
 go 1.19