Resolving ko-build#21 issue. Fixing conflicts after commands refactor…

…ing. Improving version command
cpanato · May 12, 2019 · 0aca6f6 · 0aca6f6
2 parents e8b7ded + cef9764
commit 0aca6f6
Show file tree

Hide file tree

Showing 25 changed files with 756 additions and 394 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+# Ignore GoLand (IntelliJ) files.
+.idea/
+
diff --git a/cmd/ko/commands.go b/cmd/ko/commands.go
diff --git a/cmd/ko/main.go b/cmd/ko/main.go
@@ -15,6 +15,7 @@
 package main
 
 import (
+	"github.com/google/ko/pkg/commands"
 	"log"
 
 	"github.com/spf13/cobra"
@@ -29,7 +30,7 @@ func main() {
 			cmd.Help()
 		},
 	}
-	addKubeCommands(cmds)
+	commands.AddKubeCommands(cmds)
 
 	if err := cmds.Execute(); err != nil {
 		log.Fatalf("error during command execution: %v", err)

diff --git a/hack/release.sh b/hack/release.sh
@@ -25,6 +25,6 @@ VERSION=$1
 KO_ROOT="$(cd "$(dirname "$0")" && pwd)/.."
 
 go get github.com/ahmetb/govvv
-govvv build -o $KO_ROOT/build/ko $KO_ROOT/cmd/ko -version $VERSION
+govvv build -o $KO_ROOT/build/ko $KO_ROOT/cmd/ko -pkg github.com/google/ko/pkg/commands -version $VERSION
 git tag $VERSION
 git push origin $VERSION