+465
-77011
lines changed Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
1 1
project_name: ks
2 2
builds:
3 -
- main: .
3 +
- main: ./cmd/ks/main.go
4 4
binary: ks
5 5
ldflags: -X main.version={{.Version}}
6 6
goos:
@@ -66,26 +66,7 @@ before_install:
66 66
export GO_LDFLAGS='-linkmode external -extldflags=-static'
67 67
fi
68 68
install:
69 -
- go build -i -ldflags "$GO_LDFLAGS" .
70 -
- |
71 -
if [ "$DO_INTEGRATION_TEST" = 1 ]; then
72 -
if ! which minikube; then
73 -
wget -O minikube \
74 -
https://storage.googleapis.com/minikube/releases/v0.21.0/minikube-$(go env GOOS)-$(go env GOARCH)
75 -
install -m 755 minikube $GOPATH/bin/minikube
76 -
fi
77 -
if ! which kubectl; then
78 -
wget https://storage.googleapis.com/kubernetes-release/release/$INT_KVERS/bin/$(go env GOOS)/$(go env GOARCH)/kubectl
79 -
install -m 755 kubectl $GOPATH/bin/kubectl
80 -
fi
81 -
mkdir -p $HOME/.kube
82 -
touch $HOME/.kube/config
83 -
sudo -E $GOPATH/bin/minikube start --vm-driver=none \
84 -
--extra-config apiserver.Authorization.Mode=RBAC \
85 -
--kubernetes-version $INT_KVERS
86 - 87 -
go get github.com/onsi/ginkgo/ginkgo
88 -
fi
69 +
- go build -i -ldflags "$GO_LDFLAGS" ./cmd/ks
89 70
script:
90 71
- make VERSION="$VERSION" EXTRA_GO_FLAGS="$EXTRA_GO_FLAGS_TEST" test
91 72
- make vet
@@ -40,13 +40,13 @@ INTEGRATION_TEST_FIXTURES = ./fixtures
40 40
all: ks docs
41 41 42 42
ks:
43 -
$(GO) build -o $(KS_BIN) $(GO_FLAGS) .
43 +
$(GO) build -o $(KS_BIN) $(GO_FLAGS) ./cmd/ks
44 44 45 45
docs:
46 46
$(DOC_GEN_FILE)
47 47 48 48
install:
49 -
$(GO) build -o $(GOPATH)/bin/ks $(GO_FLAGS) .
49 +
$(GO) build -o $(GOPATH)/bin/ks $(GO_FLAGS) ./cmd/ks
50 50 51 51
test: gotest docstest
52 52
@@ -20,7 +20,7 @@ import (
20 20 21 21
log "github.com/sirupsen/logrus"
22 22 23 -
"github.com/ksonnet/ksonnet/cmd"
23 +
"github.com/ksonnet/ksonnet/pkg/clicmd"
24 24
"github.com/ksonnet/ksonnet/pkg/kubecfg"
25 25
)
26 26
@@ -29,10 +29,10 @@ var version = "(dev build)"
29 29
var apimachineryVersion = ""
30 30 31 31
func main() {
32 -
cmd.Version = version
33 -
cmd.APImachineryVersion = apimachineryVersion
32 +
clicmd.Version = version
33 +
clicmd.APImachineryVersion = apimachineryVersion
34 34 35 -
if err := cmd.RootCmd.Execute(); err != nil {
35 +
if err := clicmd.RootCmd.Execute(); err != nil {
36 36
// PersistentPreRunE may not have been run for early
37 37
// errors, like invalid command line flags.
38 38
logFmt := &log.TextFormatter{
@@ -17,16 +17,16 @@ package main
17 17 18 18
import (
19 19
"log"
20 -
"os"
20 +
"os"
21 21 22 +
"github.com/ksonnet/ksonnet/pkg/clicmd"
22 23
"github.com/spf13/cobra/doc"
23 -
"github.com/ksonnet/ksonnet/cmd"
24 24
)
25 25 26 26
func main() {
27 27
outputDir := os.Args[1]
28 28 29 -
cmd := cmd.RootCmd
29 +
cmd := clicmd.RootCmd
30 30
// Remove auto-generated timestamps
31 31
cmd.DisableAutoGenTag = true
32 32
@@ -127,7 +127,7 @@ func (e *e2e) buildKs() {
127 127
"build",
128 128
"-o",
129 129
e.ksBin(),
130 -
`github.com/ksonnet/ksonnet`,
130 +
`github.com/ksonnet/ksonnet/cmd/ks`,
131 131
}
132 132 133 133
cmd := exec.Command("go", args...)
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4