fix: build script, replace kcl-go (#80)

KusionStack · Jun 24, 2022 · fd58099 · fd58099
1 parent 1c2494f
commit fd58099
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -93,22 +93,22 @@ build-local-darwin:  ## Build kusion tool chain for macOS
 		-ldflags="-s -w" \
 		./cmd/kusionctl
 
+build-local-darwin-all: build-local-darwin ## Build kusion & kcl tool chain for macOS
+	# Install kclvm darwin
+	go run ./scripts/install-kclvm \
+		--triple=Darwin \
+		--mirrors=${KCLVM_URL_BASE_MIRRORS} \
+		--outdir=./_build/bundles/kusion-darwin/kclvm
+
 	# Build kcl-go
 	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 \
 		go build -o ${PWD}/_build/bundles/kusion-darwin/kclvm/bin/kcl-go \
 		./cmd/kcl-go
 
-	# # Build kcl-openapi
+	# Build kcl-openapi
 	# cd ./cmd/kcl-openapi && GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 \
 	# 	go build -o ${PWD}/_build/bundles/kusion-darwin/bin/kcl-openapi
 
-build-local-darwin-all: build-local-darwin ## Build kusion & kcl tool chain for macOS
-	# Install kclvm darwin
-	go run ./scripts/install-kclvm \
-		--triple=Darwin \
-		--mirrors=${KCLVM_URL_BASE_MIRRORS} \
-		--outdir=./_build/bundles/kusion-darwin/kclvm
-
 	# chmod +x
 	-chmod +x ./_build/bundles/kusion-darwin/bin/kusion
 	# -chmod +x ./_build/bundles/kusion-darwin/bin/kcl-openapi
@@ -149,6 +149,13 @@ build-local-darwin-arm64: ## Build kusion tool chain for macOS arm64
 		-ldflags="-s -w" \
 		./cmd/kusionctl
 
+build-local-darwin-arm64-all: build-local-darwin-arm64 ## Build kusion & kcl tool chain for macOS arm64
+	# Install kclvm darwin
+	go run ./scripts/install-kclvm \
+		--triple=Darwin-arm64 \
+		--mirrors=${KCLVM_URL_BASE_MIRRORS} \
+		--outdir=./_build/bundles/kusion-darwin-arm64/kclvm
+
 	# Build kcl-go
 	GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 \
 		go build -o ${PWD}/_build/bundles/kusion-darwin-arm64/kclvm/bin/kcl-go \
@@ -158,13 +165,6 @@ build-local-darwin-arm64: ## Build kusion tool chain for macOS arm64
 	# cd ./cmd/kcl-openapi && GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 \
 	# 	go build -o ${PWD}/_build/bundles/kusion-darwin-arm64/bin/kcl-openapi
 
-build-local-darwin-arm64-all: build-local-darwin-arm64 ## Build kusion & kcl tool chain for macOS arm64
-	# Install kclvm darwin
-	go run ./scripts/install-kclvm \
-		--triple=Darwin-arm64 \
-		--mirrors=${KCLVM_URL_BASE_MIRRORS} \
-		--outdir=./_build/bundles/kusion-darwin-arm64/kclvm
-
 	# chmod +x
 	-chmod +x ./_build/bundles/kusion-darwin-arm64/bin/kusion
 	# -chmod +x ./_build/bundles/kusion-darwin-arm64/bin/kcl-openapi
@@ -211,14 +211,6 @@ build-local-linux:  ## Build kusion tool chain for linux
 		-ldflags="-s -w" \
 		./cmd/kusionctl
 
-	# Build kcl-go
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
-		go build -o ${PWD}/_build/bundles/kusion-linux/kclvm/bin/kcl-go \
-		./cmd/kcl-go
-
-	# # Build kcl-openapi
-	# cd ./cmd/kcl-openapi && GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
-	# 	go build -o ${PWD}/_build/bundles/kusion-linux/bin/kcl-openapi
 
 build-local-linux-all: build-local-linux  ## Build kusion & kcl tool chain for linux
 	# Install kclvm linux
@@ -227,6 +219,15 @@ build-local-linux-all: build-local-linux  ## Build kusion & kcl tool chain for l
 		--mirrors=${KCLVM_URL_BASE_MIRRORS} \
 		--outdir=./_build/bundles/kusion-linux/kclvm
 
+	# Build kcl-go
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
+		go build -o ${PWD}/_build/bundles/kusion-linux/kclvm/bin/kcl-go \
+		./cmd/kcl-go
+
+	# Build kcl-openapi
+	# cd ./cmd/kcl-openapi && GOOS=linux GOARCH=amd64 CGO_ENABLED=0 \
+	# 	go build -o ${PWD}/_build/bundles/kusion-linux/bin/kcl-openapi
+
 	# chmod +x
 	-chmod +x ./_build/bundles/kusion-linux/bin/kusion
 	# -chmod +x ./_build/bundles/kusion-linux/bin/kcl-openapi
@@ -267,22 +268,22 @@ build-local-windows:  ## Build kusion tool chain for windows
 		-ldflags="-s -w" \
 		./cmd/kusionctl
 
-	# Build kcl-go
-	GOOS=windows GOARCH=amd64 CGO_ENABLED=0 \
-		go build -o ${PWD}/_build/bundles/kusion-windows/kclvm/bin/kcl-go \
-		./cmd/kcl-go
-
-	# # Build kcl-openapi
-	# cd ./cmd/kcl-openapi && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 \
-	# 	go build -o ${PWD}/_build/bundles/kusion-windows/bin/kcl-openapi
-
 build-local-windows-all: build-local-windows  ## Build kusion & kcl tool chain for windows
 	# Install kclvm windows
 	go run ./scripts/install-kclvm \
 		--triple=windows \
 		--mirrors=${KCLVM_URL_BASE_MIRRORS} \
 		--outdir=./_build/bundles/kusion-windows/kclvm
 
+	# Build kcl-go
+	GOOS=windows GOARCH=amd64 CGO_ENABLED=0 \
+		go build -o ${PWD}/_build/bundles/kusion-windows/kclvm/kcl-go \
+		./cmd/kcl-go
+
+	# Build kcl-openapi
+	# cd ./cmd/kcl-openapi && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 \
+	# 	go build -o ${PWD}/_build/bundles/kusion-windows/kcl-openapi
+
 	# Copy docs
 	cp -r ./docs ./_build/bundles/kusion-windows/docs
 

diff --git a/go.mod b/go.mod
@@ -71,7 +71,7 @@ require (
 	k8s.io/component-base v0.21.2
 	k8s.io/kubectl v0.21.2
 	kusionstack.io/kcl-plugin v0.4.1-alpha2
-	kusionstack.io/kclvm-go v0.4.2-alpha4
+	kusionstack.io/kclvm-go v0.4.2-alpha.9
 	sigs.k8s.io/kustomize/api v0.8.11
 	sigs.k8s.io/kustomize/kustomize/v4 v4.1.2
 	sigs.k8s.io/kustomize/kyaml v0.11.0

diff --git a/go.sum b/go.sum
@@ -1349,6 +1349,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 kusionstack.io/kcl-plugin v0.4.1-alpha2 h1:m43JJhpJSjl/Q3FqghJf5dRIwdXsrJeKxrHhgqLJqbA=
 kusionstack.io/kcl-plugin v0.4.1-alpha2/go.mod h1:VgB7qXVbDGWFOh/qb/yXf75+UrliP5EPXOQUDqBCdAQ=
+kusionstack.io/kclvm-go v0.4.2-alpha.9 h1:c4mDJFlKuP3CbGTtEkFEQidxcsJpGHNCDBtv7eexlH8=
+kusionstack.io/kclvm-go v0.4.2-alpha.9/go.mod h1:LKGVud6Ch0dLLACwPqZQyU4E+NkLAXzveJFQWVb5Pbk=
 kusionstack.io/kclvm-go v0.4.2-alpha4 h1:HL8dElxruBHcPbPl3MsfoojFhfeHDH/GHeUryuekrho=
 kusionstack.io/kclvm-go v0.4.2-alpha4/go.mod h1:LKGVud6Ch0dLLACwPqZQyU4E+NkLAXzveJFQWVb5Pbk=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=