diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 37c32a3fa..f9cade31b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,5 +2,5 @@ // README at: https://github.com/devcontainers/templates/tree/main/src/alpine { // ref: https://docs.github.com/en/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers#dockerfile - "image": "docker.io/kusionstack/kclvm-builder:latest" + "image": "docker.io/kcllang/kcl-builder:latest" } \ No newline at end of file diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3bcdd46be..12ef5dc3a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -40,25 +40,23 @@ jobs: run: export PATH=$PATH:$PWD/_build/dist/ubuntu/kclvm/bin && make build shell: bash - # KCL docker image build and upload, TODO: bump kusionstack/kclvm to kcl-lang/kcl - - # - name: Copy Dockerfile to the current work directory - # run: cp scripts/docker/kclvm/Dockerfile . - # shell: bash - # - name: Login to Docker Hub - # uses: docker/login-action@v2 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} - # - name: Extract metadata (tags, labels) for Docker - # id: meta - # uses: docker/metadata-action@v4 - # with: - # images: kusionstack/kclvm - # - name: Build and push Docker image - # uses: docker/build-push-action@v3 - # with: - # context: . - # push: ${{ github.event_name != 'pull_request' }} - # tags: ${{ steps.meta.outputs.tags }} - # labels: ${{ steps.meta.outputs.labels }} + - name: Copy Dockerfile to the current work directory + run: cp scripts/docker/kcl/Dockerfile . + shell: bash + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: kcllang/kcl + - name: Build and push Docker image + uses: docker/build-push-action@v3 + with: + context: . + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/ubuntu_test.yaml b/.github/workflows/ubuntu_test.yaml index 2c4963009..a9dd5bc5d 100644 --- a/.github/workflows/ubuntu_test.yaml +++ b/.github/workflows/ubuntu_test.yaml @@ -6,7 +6,7 @@ jobs: name: Test runs-on: ubuntu-latest container: - image: kusionstack/kclvm-builder + image: kcllang/kcl-builder steps: - name: Check out code uses: actions/checkout@v3 diff --git a/Makefile b/Makefile index c7ff016a4..e146c6c33 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ PROJECT_NAME = KCLVM PWD:=$(shell pwd) KCLVM_VERSION := $(shell cat VERSION) -BUILD_IMAGE:=kusionstack/kclvm-builder +BUILD_IMAGE:=kcllang/kcl-builder # export DOCKER_DEFAULT_PLATFORM=linux/amd64 # or diff --git a/docs/dev_guide/2.quick_start.md b/docs/dev_guide/2.quick_start.md index 55903b236..e62f566a3 100644 --- a/docs/dev_guide/2.quick_start.md +++ b/docs/dev_guide/2.quick_start.md @@ -10,7 +10,7 @@ Before asking a question, make sure you have: - [KCL GitHub Issues](https://github.com/kcl-lang/kcl/issues?utf8=%E2%9C%93&q=is%3Aissue) - Read the documentations: - - [KCL Documents](https://kusionstack.io/docs/reference/lang/lang/tour) + - [KCL Documents](https://kcl-lang.io/docs/reference/lang/tour) - [KCL Readme](https://github.com/kcl-lang/kcl) If you have any questions about `KCL`, you are welcome to ask your questions in [KCL Github Issues](https://github.com/kcl-lang/kcl/issues). When you ask a question, please describe the details as clearly as possible so that others in the KCL community can understand, and you *MUST* be polite and avoid personal attack and avoid not objective comparison with other projects. diff --git a/internal/scripts/cli/kcl-test b/internal/scripts/cli/kcl-test index 0c8914a19..07f708482 100755 --- a/internal/scripts/cli/kcl-test +++ b/internal/scripts/cli/kcl-test @@ -2,7 +2,7 @@ kcl_go_path=$(cd `dirname $0`; pwd)/kcl-go if [[ ! -f $kcl_go_path ]]; then - echo "kcl-go not found, please check the installation at https://github.com/KusionStack/kclvm-go" + echo "kcl-go not found, please check the installation at https://github.com/kcl-lang/kcl-go" exit 1 fi export PYTHONPATH='' diff --git a/scripts/docker/kclvm-builder-centos7/Dockerfile b/scripts/docker/kcl-builder-centos7/Dockerfile similarity index 100% rename from scripts/docker/kclvm-builder-centos7/Dockerfile rename to scripts/docker/kcl-builder-centos7/Dockerfile diff --git a/scripts/docker/kclvm-builder/Makefile b/scripts/docker/kcl-builder-centos7/Makefile similarity index 89% rename from scripts/docker/kclvm-builder/Makefile rename to scripts/docker/kcl-builder-centos7/Makefile index 5fbabadd3..50a81bd5e 100644 --- a/scripts/docker/kclvm-builder/Makefile +++ b/scripts/docker/kcl-builder-centos7/Makefile @@ -2,7 +2,7 @@ PWD:=$(shell pwd) -BUILDER_IMAGE:=kusionstack/kclvm-builder +BUILDER_IMAGE:=kcllang/kcl-builder:centos7 # export DOCKER_DEFAULT_PLATFORM=linux/amd64 # or @@ -13,7 +13,7 @@ RUN_IN_DOCKER+=-v ~/.ssh:/root/.ssh RUN_IN_DOCKER+=-v ~/.gitconfig:/root/.gitconfig RUN_IN_DOCKER+=-v ~/go/pkg/mod:/go/pkg/mod -kclvm-builder: +kcl-builder: docker build --platform linux/amd64 -t ${BUILDER_IMAGE} . @echo "ok" @@ -21,7 +21,7 @@ publish-builder: # https://docker.inc.com/ # docker login --username= - # make kclvm-builder + # make kcl-builder docker push ${BUILDER_IMAGE} @echo "push ${BUILDER_IMAGE} ok" diff --git a/scripts/docker/kclvm-builder-centos8/Dockerfile b/scripts/docker/kcl-builder-centos8/Dockerfile similarity index 100% rename from scripts/docker/kclvm-builder-centos8/Dockerfile rename to scripts/docker/kcl-builder-centos8/Dockerfile diff --git a/scripts/docker/kclvm-builder-centos8/Makefile b/scripts/docker/kcl-builder-centos8/Makefile similarity index 88% rename from scripts/docker/kclvm-builder-centos8/Makefile rename to scripts/docker/kcl-builder-centos8/Makefile index bdd015c0f..fb5729044 100644 --- a/scripts/docker/kclvm-builder-centos8/Makefile +++ b/scripts/docker/kcl-builder-centos8/Makefile @@ -2,7 +2,7 @@ PWD:=$(shell pwd) -BUILDER_IMAGE:=kusionstack/kclvm-builder:centos8 +BUILDER_IMAGE:=kcllang/kcl-builder:centos8 # export DOCKER_DEFAULT_PLATFORM=linux/amd64 # or @@ -13,7 +13,7 @@ RUN_IN_DOCKER+=-v ~/.ssh:/root/.ssh RUN_IN_DOCKER+=-v ~/.gitconfig:/root/.gitconfig RUN_IN_DOCKER+=-v ~/go/pkg/mod:/go/pkg/mod -kclvm-builder: +kcl-builder: docker build --platform linux/amd64 -t ${BUILDER_IMAGE} . @echo "ok" @@ -21,7 +21,7 @@ publish-builder: # https://docker.inc.com/ # docker login --username= - # make kclvm-builder + # make kcl-builder docker push ${BUILDER_IMAGE} @echo "push ${BUILDER_IMAGE} ok" diff --git a/scripts/docker/kclvm-builder/Dockerfile b/scripts/docker/kcl-builder/Dockerfile similarity index 100% rename from scripts/docker/kclvm-builder/Dockerfile rename to scripts/docker/kcl-builder/Dockerfile diff --git a/scripts/docker/kclvm-builder-centos7/Makefile b/scripts/docker/kcl-builder/Makefile similarity index 83% rename from scripts/docker/kclvm-builder-centos7/Makefile rename to scripts/docker/kcl-builder/Makefile index 9868ff39d..e6f6c962f 100644 --- a/scripts/docker/kclvm-builder-centos7/Makefile +++ b/scripts/docker/kcl-builder/Makefile @@ -1,9 +1,8 @@ # Copyright 2021 The KCL Authors. All rights reserved. PWD:=$(shell pwd) -TIMESTAMP:=$(shell go run timestamp.go) -BUILDER_IMAGE:=kusionstack/kclvm-builder:centos7 +BUILDER_IMAGE:=kcllang/kcl-builder # export DOCKER_DEFAULT_PLATFORM=linux/amd64 # or @@ -14,7 +13,7 @@ RUN_IN_DOCKER+=-v ~/.ssh:/root/.ssh RUN_IN_DOCKER+=-v ~/.gitconfig:/root/.gitconfig RUN_IN_DOCKER+=-v ~/go/pkg/mod:/go/pkg/mod -kclvm-builder: +kcl-builder: docker build --platform linux/amd64 -t ${BUILDER_IMAGE} . @echo "ok" @@ -22,7 +21,7 @@ publish-builder: # https://docker.inc.com/ # docker login --username= - # make kclvm-builder + # make kcl-builder docker push ${BUILDER_IMAGE} @echo "push ${BUILDER_IMAGE} ok" diff --git a/scripts/docker/kclvm/Dockerfile b/scripts/docker/kcl/Dockerfile similarity index 100% rename from scripts/docker/kclvm/Dockerfile rename to scripts/docker/kcl/Dockerfile diff --git a/scripts/docker/kclvm-builder-centos7/timestamp.go b/scripts/docker/kclvm-builder-centos7/timestamp.go deleted file mode 100644 index 96d8a87dc..000000000 --- a/scripts/docker/kclvm-builder-centos7/timestamp.go +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2021 The KCL Authors. All rights reserved. - -//go:build ignore -// +build ignore - -package main - -import ( - "fmt" - "time" -) - -func main() { - t := time.Now() - fmt.Printf( - "%04d%02d%02d-%02d%02d%02d", - t.Year(), t.Month(), t.Day(), - t.Hour(), t.Minute(), t.Second(), - ) -} diff --git a/scripts/docker/kclvm/.keep b/scripts/docker/kclvm/.keep deleted file mode 100644 index e69de29bb..000000000