Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
veezhang committed Jun 4, 2021
1 parent 98ad91c commit 82b4067
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 259 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -73,9 +73,7 @@ lint: $(GOBIN)/golangci-lint

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
go test ./pkg/... -coverprofile cover.out

##@ e2e
e2e: $(GOBIN)/ginkgo $(GOBIN)/kind helm
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 82b4067

Please sign in to comment.