From 28d1e9f6614a8a3edaf373bfb293ed6a969a326c Mon Sep 17 00:00:00 2001 From: dlorenc Date: Thu, 11 Mar 2021 08:55:44 -0600 Subject: [PATCH] This way cosign can be installed with "go install github.com/sigstore/cosign/cmd/cosign@main" (#69) for now! Signed-off-by: Dan Lorenc --- .github/workflows/tests.yaml | 19 +------------------ cmd/{cli => cosign}/download.go | 0 cmd/{cli => cosign}/generate.go | 0 cmd/{cli => cosign}/generate_key_pair.go | 0 cmd/{cli => cosign}/sign.go | 0 cmd/{cli => cosign}/sign_blob.go | 0 cmd/{cli => cosign}/triangulate.go | 0 cmd/{cli => cosign}/upload.go | 0 cmd/{cli => cosign}/verify.go | 0 cmd/{cli => cosign}/verify_blob.go | 0 cmd/main.go | 2 +- test/e2e_test.go | 2 +- 12 files changed, 3 insertions(+), 20 deletions(-) rename cmd/{cli => cosign}/download.go (100%) rename cmd/{cli => cosign}/generate.go (100%) rename cmd/{cli => cosign}/generate_key_pair.go (100%) rename cmd/{cli => cosign}/sign.go (100%) rename cmd/{cli => cosign}/sign_blob.go (100%) rename cmd/{cli => cosign}/triangulate.go (100%) rename cmd/{cli => cosign}/upload.go (100%) rename cmd/{cli => cosign}/verify.go (100%) rename cmd/{cli => cosign}/verify_blob.go (100%) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a00904dbc9..21adcbc6b7 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -27,21 +27,4 @@ jobs: with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. version: v1.29 - - # Optional: working directory, useful for monorepos - # working-directory: somedir - - # Optional: golangci-lint command line arguments. - # args: --issues-exit-code=0 - - # Optional: show only new issues if it's a pull request. The default value is `false`. - # only-new-issues: true - - # Optional: if set to true then the action will use pre-installed Go. - # skip-go-installation: true - - # Optional: if set to true then the action don't cache or restore ~/go/pkg. - # skip-pkg-cache: true - - # Optional: if set to true then the action don't cache or restore ~/.cache/go-build. - # skip-build-cache: true + timeout: 5m diff --git a/cmd/cli/download.go b/cmd/cosign/download.go similarity index 100% rename from cmd/cli/download.go rename to cmd/cosign/download.go diff --git a/cmd/cli/generate.go b/cmd/cosign/generate.go similarity index 100% rename from cmd/cli/generate.go rename to cmd/cosign/generate.go diff --git a/cmd/cli/generate_key_pair.go b/cmd/cosign/generate_key_pair.go similarity index 100% rename from cmd/cli/generate_key_pair.go rename to cmd/cosign/generate_key_pair.go diff --git a/cmd/cli/sign.go b/cmd/cosign/sign.go similarity index 100% rename from cmd/cli/sign.go rename to cmd/cosign/sign.go diff --git a/cmd/cli/sign_blob.go b/cmd/cosign/sign_blob.go similarity index 100% rename from cmd/cli/sign_blob.go rename to cmd/cosign/sign_blob.go diff --git a/cmd/cli/triangulate.go b/cmd/cosign/triangulate.go similarity index 100% rename from cmd/cli/triangulate.go rename to cmd/cosign/triangulate.go diff --git a/cmd/cli/upload.go b/cmd/cosign/upload.go similarity index 100% rename from cmd/cli/upload.go rename to cmd/cosign/upload.go diff --git a/cmd/cli/verify.go b/cmd/cosign/verify.go similarity index 100% rename from cmd/cli/verify.go rename to cmd/cosign/verify.go diff --git a/cmd/cli/verify_blob.go b/cmd/cosign/verify_blob.go similarity index 100% rename from cmd/cli/verify_blob.go rename to cmd/cosign/verify_blob.go diff --git a/cmd/main.go b/cmd/main.go index 26170ca413..a1fdffa150 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -24,7 +24,7 @@ import ( "github.com/google/go-containerregistry/pkg/logs" "github.com/peterbourgon/ff/v3/ffcli" - "github.com/sigstore/cosign/cmd/cli" + cli "github.com/sigstore/cosign/cmd/cosign" ) var ( diff --git a/test/e2e_test.go b/test/e2e_test.go index 4672056d1e..b60526d9d4 100644 --- a/test/e2e_test.go +++ b/test/e2e_test.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-containerregistry/pkg/v1/random" "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/sigstore/cosign/cmd/cli" + cli "github.com/sigstore/cosign/cmd/cosign" ) var keyPass = []byte("hello")