Fix presubmit (#1161)

- gofmt things using Go 1.17+ - go install @Version instead of go get - go get some k8schain deps
google · Nov 1, 2021 · 0dfbb56 · 0dfbb56
1 parent dd86162
commit 0dfbb56
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 27 deletions.
diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml
@@ -15,34 +15,19 @@
 name: Presubmit
 
 on:
-
   push:
-    branches: [ 'main', 'master' ]
-
+    branches: ['main']
   pull_request:
-    branches: [ 'main', 'master', 'release-*' ]
+    branches: ['main']
 
 jobs:
-
-  test:
+  presubmit:
     name: Presubmit
-    strategy:
-      matrix:
-        go-version: [1.15.x]
-        platform: [ubuntu-latest]
-
-    runs-on: ${{ matrix.platform }}
+    runs-on: 'ubuntu-latest'
 
     steps:
-
-      - name: Set up Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v2
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
         with:
-          go-version: ${{ matrix.go-version }}
-        id: go
-
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Run presubmit
-        run: ./hack/presubmit.sh
+          go-version: 1.16.x
+      - run: ./hack/presubmit.sh
diff --git a/hack/presubmit.sh b/hack/presubmit.sh
@@ -25,8 +25,8 @@ TMP_DIR="$(mktemp -d)"
 export PATH="${PATH}:${TMP_DIR}/bin"
 pushd ${TMP_DIR}
 trap popd EXIT
-go get -v -u golang.org/x/lint/golint
-go get honnef.co/go/tools/cmd/staticcheck
+go install golang.org/x/lint/golint@v0.0.0-20210508222113-6edffad5e616
+go install honnef.co/go/tools/cmd/staticcheck@v0.2.1
 popd
 
 pushd ${PROJECT_ROOT}

diff --git a/internal/signal/go116.go b/internal/signal/go116.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build go1.16
 // +build go1.16
 
 package signal

diff --git a/internal/signal/signal.go b/internal/signal/signal.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !go1.16
 // +build !go1.16
 
 package signal

diff --git a/pkg/authn/k8schain/go.sum b/pkg/authn/k8schain/go.sum
diff --git a/pkg/authn/k8schain/k8schain_aws.go b/pkg/authn/k8schain/k8schain_aws.go
@@ -1,4 +1,6 @@
+//go:build !disable_aws
 // +build !disable_aws
+
 // Copyright 2019 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pkg/authn/k8schain/k8schain_azure.go b/pkg/authn/k8schain/k8schain_azure.go
@@ -1,4 +1,6 @@
+//go:build !disable_azure
 // +build !disable_azure
+
 // Copyright 2019 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pkg/authn/k8schain/k8schain_gcp.go b/pkg/authn/k8schain/k8schain_gcp.go
@@ -1,4 +1,6 @@
+//go:build !disable_gcp
 // +build !disable_gcp
+
 // Copyright 2019 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pkg/name/internal/must_test.go b/pkg/name/internal/must_test.go
@@ -1,3 +1,4 @@
+//go:build compile
 // +build compile
 
 // Copyright 2021 Google LLC All Rights Reserved.

diff --git a/pkg/v1/google/auth_test.go b/pkg/v1/google/auth_test.go
@@ -1,5 +1,6 @@
-// +build !arm64
-// +build !darwin
+//go:build !arm64 && !darwin
+// +build !arm64,!darwin
+
 // Copyright 2018 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/pkg/v1/remote/check_e2e_test.go b/pkg/v1/remote/check_e2e_test.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build integration
 // +build integration
 
 package remote

diff --git a/pkg/v1/zz_deepcopy_generated.go b/pkg/v1/zz_deepcopy_generated.go