fix

vesoft-inc · Jun 4, 2021 · 48615ba · 48615ba
1 parent 98ad91c
commit 48615ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 260 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -32,7 +32,11 @@ jobs:
         run: |
           export GOPATH=${GITHUB_WORKSPACE}/go
           export PATH=$PATH:$GOPATH/bin
-          make test
+          pwd
+          tree -L 2
+          which make
+          which gcc
+          make test -d
         working-directory: ${{ github.workspace }}/go/src/github.com/${{ github.repository }}
 
       - name: Auto commit after test

diff --git a/Makefile b/Makefile
@@ -41,10 +41,10 @@ help: ## Display this help.
 ##@ Development
 
 manifests: $(GOBIN)/controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(GOBIN)/controller-gen $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(GOBIN)/controller-gen $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/..." paths="./..." output:crd:artifacts:config=config/crd/bases
 
 generate: $(GOBIN)/controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	$(GOBIN)/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	$(GOBIN)/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./apis/..." paths="./pkg/..."
 
 check: fmt vet imports lint
 
@@ -72,10 +72,8 @@ lint: $(GOBIN)/golangci-lint
 	$(GOBIN)/golangci-lint run
 
 ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
-test: manifests generate check ## Run tests.
-	mkdir -p ${ENVTEST_ASSETS_DIR}
-	test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.0/hack/setup-envtest.sh
-	source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./pkg/... -coverprofile cover.out
+test: check # manifests generate check ## Run tests.
+	go test ./pkg/... -coverprofile cover.out
 
 ##@ e2e
 e2e: $(GOBIN)/ginkgo $(GOBIN)/kind helm

diff --git a/go.mod b/go.mod
@@ -11,9 +11,9 @@ require (
 	github.com/onsi/gomega v1.10.2
 	github.com/openkruise/kruise-api v0.8.0
 	github.com/pkg/errors v0.9.1
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.5
 	github.com/vesoft-inc/nebula-go v0.0.0-20210322063004-e37085b865d6
-	go.uber.org/zap v1.15.0 // indirect
+	go.uber.org/zap v1.15.0
 	k8s.io/api v0.19.2
 	k8s.io/apimachinery v0.19.2
 	k8s.io/apiserver v0.19.2