Something changed in go 1.17 to make this a failure now. (#631)

Signed-off-by: Dan Lorenc <dlorenc@google.com>
sigstore · Sep 6, 2021 · 53fbe01 · 53fbe01
1 parent a05fb65
commit 53fbe01
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/cmd/cosign/cli/pivcli/disabled.go b/cmd/cosign/cli/pivcli/disabled.go
@@ -1,3 +1,4 @@
+//go:build !pivkey || !cgo
 // +build !pivkey !cgo
 
 // Copyright 2021 The Sigstore Authors

diff --git a/pkg/cosign/pivkey/disabled.go b/pkg/cosign/pivkey/disabled.go
@@ -1,3 +1,4 @@
+//go:build !pivkey || !cgo
 // +build !pivkey !cgo
 
 // Copyright 2021 The Sigstore Authors.

diff --git a/pkg/cosign/pivkey/pivkey.go b/pkg/cosign/pivkey/pivkey.go
@@ -1,5 +1,5 @@
-// +build pivkey
-// +build cgo
+//go:build pivkey && cgo
+// +build pivkey,cgo
 
 // Copyright 2021 The Sigstore Authors.
 //

diff --git a/pkg/cosign/pivkey/util.go b/pkg/cosign/pivkey/util.go
@@ -1,5 +1,5 @@
-// +build pivkey
-// +build cgo
+//go:build pivkey && cgo
+// +build pivkey,cgo
 
 // Copyright 2021 The Sigstore Authors
 //