Bump things to 1.18

google · Dec 12, 2022 · abe5396 · abe5396
1 parent 76965fe
commit abe5396
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 82 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.18] # TODO: add 1.19
+        go-version: [1.18, 1.19] # TODO: add 1.20
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
         run: git fetch --prune --unshallow
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
           check-latest: true
       - uses: goreleaser/goreleaser-action@v3.2.0
         id: run-goreleaser

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -11,7 +11,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.18] # TODO: add 1.19
+        go-version: [1.18, 1.19] # TODO: add 1.20
 
     name: Unit Tests
     runs-on: ubuntu-latest

diff --git a/cmd/crane/main.go b/cmd/crane/main.go
@@ -17,9 +17,9 @@ package main
 import (
 	"context"
 	"os"
+	"os/signal"
 
 	"github.com/google/go-containerregistry/cmd/crane/cmd"
-	"github.com/google/go-containerregistry/internal/signal"
 	"github.com/google/go-containerregistry/pkg/logs"
 )
 

diff --git a/cmd/gcrane/main.go b/cmd/gcrane/main.go
@@ -17,10 +17,10 @@ package main
 import (
 	"context"
 	"os"
+	"os/signal"
 
 	"github.com/google/go-containerregistry/cmd/crane/cmd"
 	gcmd "github.com/google/go-containerregistry/cmd/gcrane/cmd"
-	"github.com/google/go-containerregistry/internal/signal"
 	"github.com/google/go-containerregistry/pkg/crane"
 	"github.com/google/go-containerregistry/pkg/gcrane"
 	"github.com/google/go-containerregistry/pkg/logs"

diff --git a/hack/bump-deps.sh b/hack/bump-deps.sh
@@ -24,22 +24,22 @@ pushd ${PROJECT_ROOT}
 trap popd EXIT
 
 go get -u ./...
-go mod tidy -compat=1.17
+go mod tidy -compat=1.18
 go mod vendor
 
 cd ${PROJECT_ROOT}/pkg/authn/k8schain
 go get -u ./...
-go mod tidy -compat=1.17
+go mod tidy -compat=1.18
 go mod download
 
 cd ${PROJECT_ROOT}/pkg/authn/kubernetes
 go get -u ./...
-go mod tidy -compat=1.17
+go mod tidy -compat=1.18
 go mod download
 
 cd ${PROJECT_ROOT}/cmd/krane
 go get -u ./...
-go mod tidy -compat=1.17
+go mod tidy -compat=1.18
 go mod download
 
 cd ${PROJECT_ROOT}

diff --git a/internal/signal/go116.go b/internal/signal/go116.go
diff --git a/internal/signal/signal.go b/internal/signal/signal.go