remove cli-bindata-gen from ci and makefile

oceanbase · Dec 19, 2024 · cbfa6aa · cbfa6aa
1 parent 3926c51
commit cbfa6aa
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
 
       - name: generate bindata
-        run: make dashboard-bindata-gen dashboard-doc-gen cli-bindata-gen
+        run: make dashboard-bindata-gen dashboard-doc-gen
 
       - name: go mod vendor
         run: go mod vendor

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -31,7 +31,7 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
 
       - name: generate bindata
-        run: make dashboard-bindata-gen cli-bindata-gen dashboard-doc-gen
+        run: make dashboard-bindata-gen dashboard-doc-gen
 
       - name: go mod vendor
         run: go mod vendor

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -24,7 +24,7 @@ jobs:
           cache: true
 
       - name: generate bindata
-        run: make dashboard-bindata-gen dashboard-doc-gen cli-bindata-gen
+        run: make dashboard-bindata-gen dashboard-doc-gen
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3

diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
@@ -28,7 +28,7 @@ jobs:
           go-version: ${{ env.GO_VERSION }} # The Go version to download (if necessary) and use.
 
       - name: generate bindata
-        run: make dashboard-bindata-gen dashboard-doc-gen cli-bindata-gen
+        run: make dashboard-bindata-gen dashboard-doc-gen 
 
       - name: go mod vendor 
         run: go mod vendor

diff --git a/make/build.mk b/make/build.mk
@@ -1,7 +1,7 @@
 ##@ Build
 
 .PHONY: build
-build: dashboard-doc-gen dashboard-bindata-gen cli-bindata-gen manifests generate fmt vet ## Build manager binary.
+build: dashboard-doc-gen dashboard-bindata-gen manifests generate fmt vet ## Build manager binary.
 	CGO_ENABLED=0 GOOS=linux go build -o bin/manager cmd/operator/main.go
 
 # If you wish built the manager image targeting other platforms you can use the --platform flag.

diff --git a/make/cli.mk b/make/cli.mk
@@ -27,14 +27,10 @@ CLI_BUILD := GO11MODULE=ON CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build
 BUILD_DIR?=bin/
 
 .PHONY: cli-build
-cli-build: cli-bindata-gen dashboard-doc-gen dashboard-bindata-gen ## Build oceanbase-cli
+cli-build:  ## Build oceanbase-cli
 	@echo "Building $(BINARY_NAME) for $(GOOS)/$(GOARCH)..."
 	$(CLI_BUILD) -o $(BUILD_DIR)$(BINARY_NAME) cmd/cli/main.go
 
-.PHONY: cli-bindata-gen
-cli-bindata-gen: cli-dep-install ## Generate bindata
-	go-bindata -o internal/cli/generated/bindata/bindata.go -pkg bindata internal/assets/cli-templates/...
-
 .PHONY: cli-clean
 cli-clean: ## Clean build
 	rm -rf $(RELEASE_DIR)/$(BINARY_NAME)

diff --git a/make/helper.mk b/make/helper.mk
@@ -1,6 +1,6 @@
 ##@ Helper
 
 .PHONY: helper-build
-helper-build: dashboard-bindata-gen dashboard-doc-gen cli-bindata-gen ## Build oceanbase helper binary.
+helper-build: dashboard-bindata-gen dashboard-doc-gen  ## Build oceanbase helper binary.
 	@echo "Building helper..."
 	CGO_ENABLED=0 GOOS=linux go build -a -o bin/oceanbase-helper ./cmd/oceanbase-helper/main.go