Merge pull request #147 from liyimeng/main

Adapt build to go module
alibaba · Jun 9, 2022 · dbc3d95 · dbc3d95
2 parents d9ce50a + c6b386f
commit dbc3d95
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -27,11 +27,11 @@ test:
 
 .PHONY: build
 build:
-	GO111MODULE=off CGO_ENABLED=0 $(GO_BUILD) $(LD_FLAGS) -v -o $(OUTPUT_DIR)/$(NAME) $(MAIN_FILE)
+	CGO_ENABLED=0 $(GO_BUILD) $(LD_FLAGS) -v -o $(OUTPUT_DIR)/$(NAME) $(MAIN_FILE)
 
 .PHONY: develop
 develop:
-	GOARCH=amd64 GOOS=linux GO111MODULE=off CGO_ENABLED=0 $(GO_BUILD) $(LD_FLAGS) -v -o $(OUTPUT_DIR)/$(NAME) $(MAIN_FILE)
+	GOARCH=amd64 GOOS=linux CGO_ENABLED=0 $(GO_BUILD) $(LD_FLAGS) -v -o $(OUTPUT_DIR)/$(NAME) $(MAIN_FILE)
 	chmod +x $(OUTPUT_DIR)/$(NAME)
 	docker build . -t ${IMAGE_NAME_FOR_DOCKERHUB}:${VERSION} -f ./Dockerfile.dev
 	docker tag ${IMAGE_NAME_FOR_DOCKERHUB}:${VERSION} ${IMAGE_NAME_FOR_ACR}:${VERSION} 
@@ -50,8 +50,8 @@ image-arm64:
 
 # generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
-	GO111MODULE=off ./hack/update-codegen.sh
-	GO111MODULE=off $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role crd paths="./pkg/apis/storage/$(CRD_VERSION)/..." output:crd:artifacts:config=helm/crds/
+	./hack/update-codegen.sh
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role crd paths="./pkg/apis/storage/$(CRD_VERSION)/..." output:crd:artifacts:config=helm/crds/
 
 .PHONY: fmt
 fmt:

diff --git a/pkg/apis/storage/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/storage/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/signals/signal_posix.go b/pkg/signals/signal_posix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*