Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bump kclvm version and support kclvm windows artifact. #207

Merged
merged 1 commit into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ jobs:
uses: softprops/action-gh-release@v1
with:
generate_release_notes: true
files: ./_build/bundles/*.tgz*
files: |
./_build/bundles/*.tgz*
./_build/bundles/*.zip*
append_body: true
body: |
## Docker Images
Expand Down
10 changes: 3 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM ubuntu:20.04

COPY _build/bundles/kusion-linux/ /kusion/
COPY _build/bundles/kusion-ubuntu/ /kusion/

RUN chmod +x /kusion/bin/kusion \
Expand All @@ -16,12 +15,9 @@ RUN chmod +x /kusion/bin/kusion \
&& chmod +x /kusion/kclvm/bin/kcl-go \
&& chmod +x /kusion/kclvm/bin/kclvm_cli

# Install dependency
RUN apt-get update -y
RUN apt-get install -y clang-12 lld-12 libssl-dev --no-install-recommends
RUN apt-get clean all
RUN ln -sf /usr/bin/clang-12 /usr/bin/clang
RUN ln -sf /usr/bin/wasm-ld-12 /usr/bin/wasm-ld
# Install KCL Dependencies
RUN apt-get update -y && apt-get install python3 python3-pip -y
RUN /kusion/kclvm/bin/kcl

ENV PATH="/kusion/bin:/kusion/kclvm/bin:${PATH}"
ENV KUSION_PATH="/kusion"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ clean: ## Clean build bundles
-rm -rf ./_build/bundles

# todo: fix macOS-arm64 and windows build
build-all: build-local-darwin-all build-local-ubuntu-all build-local-centos-all build-local-darwin-arm64-all ## build-local-windows-all ## Build all platforms (darwin, linux, windows)
build-all: build-local-darwin-all build-local-ubuntu-all build-local-centos-all build-local-darwin-arm64-all build-local-windows-all ## Build all platforms (darwin, linux, windows)

build-local-kusion-darwin: ## Build kusionctl only for macOS
# Delete old artifacts
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ require (
k8s.io/component-base v0.24.2
k8s.io/kubectl v0.24.2
kusionstack.io/kcl-plugin v0.4.1-alpha2
kusionstack.io/kclvm-go v0.4.4-alpha.1
kusionstack.io/kclvm-go v0.4.4-beta.2
sigs.k8s.io/controller-runtime v0.12.3
sigs.k8s.io/kustomize/api v0.11.4
sigs.k8s.io/kustomize/kustomize/v4 v4.5.4
Expand Down Expand Up @@ -166,6 +166,7 @@ require (
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
kusionstack.io/kclvm-artifact-go v0.4.4-beta.2 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 // indirect
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1190,8 +1190,10 @@ k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19V
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/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.4-alpha.1 h1:QQlanz0u0QxjBv6HTMuIwuWFPS/Xp5Sz8XGfQ/6knlI=
kusionstack.io/kclvm-go v0.4.4-alpha.1/go.mod h1:cxsYIWWMiDk7mwWJMm6H9kzNNtoIpOQHgzJBZvHThzo=
kusionstack.io/kclvm-artifact-go v0.4.4-beta.2 h1:2O88iavTScewogSuei+o3mX4AHGqfGW50gwjBOvyDmM=
kusionstack.io/kclvm-artifact-go v0.4.4-beta.2/go.mod h1:WI+NvDeMqu1AduJT119X7q8KQdYmKfv4Nq4OvZ1tAsI=
kusionstack.io/kclvm-go v0.4.4-beta.2 h1:1fF1M6OY5LUajHr9hjs3bOwkOqVsKvmTlwj2YU6cVFM=
kusionstack.io/kclvm-go v0.4.4-beta.2/go.mod h1:3wG/d94VyEmdWy9I+sqkl9d7NW9HZxlNY5rDXfCXtQk=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
Expand Down