From 5f7bdb8dda41b77fe5e12cb07e7313d4b6720055 Mon Sep 17 00:00:00 2001 From: zongz Date: Thu, 12 Dec 2024 15:26:09 +0800 Subject: [PATCH 1/4] chore: bump kcl version in github action Signed-off-by: zongz --- .github/workflows/macos_test.yaml | 2 +- .github/workflows/ubuntu_test.yaml | 2 +- .github/workflows/windows_test.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos_test.yaml b/.github/workflows/macos_test.yaml index 3be0f9236..96502779c 100644 --- a/.github/workflows/macos_test.yaml +++ b/.github/workflows/macos_test.yaml @@ -33,7 +33,7 @@ jobs: - name: Install KCL CLI run: | - go install kcl-lang.io/cli/cmd/kcl@c5ecdd12a97ca836a34744cd2f4d561eaae381ff + go install kcl-lang.io/cli/cmd/kcl@main echo "$(go env GOPATH)/bin" >> $GITHUB_PATH echo "${{ github.workspace }}/go/bin" >> $GITHUB_PATH diff --git a/.github/workflows/ubuntu_test.yaml b/.github/workflows/ubuntu_test.yaml index 90baece76..de8fbc61d 100644 --- a/.github/workflows/ubuntu_test.yaml +++ b/.github/workflows/ubuntu_test.yaml @@ -57,7 +57,7 @@ jobs: shell: bash - name: Install KCL CLI run: | - go install kcl-lang.io/cli/cmd/kcl@c5ecdd12a97ca836a34744cd2f4d561eaae381ff + go install kcl-lang.io/cli/cmd/kcl@main echo "$(go env GOPATH)/bin" >> $GITHUB_PATH echo "${{ github.workspace }}/go/bin" >> $GITHUB_PATH - name: Unit test diff --git a/.github/workflows/windows_test.yaml b/.github/workflows/windows_test.yaml index 2f8addeb5..b55178641 100644 --- a/.github/workflows/windows_test.yaml +++ b/.github/workflows/windows_test.yaml @@ -34,7 +34,7 @@ jobs: - name: Install KCL shell: powershell run: | - go install kcl-lang.io/cli/cmd/kcl@c5ecdd12a97ca836a34744cd2f4d561eaae381ff + go install kcl-lang.io/cli/cmd/kcl@main $GoPath = go env GOPATH $GoInstallBin = Join-Path $GoPath "bin" $Env:PATH += ";$GoInstallBin" From 1abe7692b6d6364e88ca2179ddf2a36f4d08a71a Mon Sep 17 00:00:00 2001 From: zongz Date: Thu, 12 Dec 2024 19:10:54 +0800 Subject: [PATCH 2/4] fix: fix test case Signed-off-by: zongz --- kclvm/driver/src/toolchain.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/kclvm/driver/src/toolchain.rs b/kclvm/driver/src/toolchain.rs index 95677f6bc..13774c6ed 100644 --- a/kclvm/driver/src/toolchain.rs +++ b/kclvm/driver/src/toolchain.rs @@ -59,6 +59,7 @@ impl + Send + Sync> Toolchain for CommandToolchain { match Command::new(&self.path) .arg("mod") .arg("metadata") + .arg("--update") .current_dir(manifest_path) .output() { From 172c6322b8f6b5bb358179a7fd12e4a03503d116 Mon Sep 17 00:00:00 2001 From: zongz Date: Mon, 16 Dec 2024 11:25:40 +0800 Subject: [PATCH 3/4] fix: rm metadata update Signed-off-by: zongz --- kclvm/driver/src/toolchain.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/kclvm/driver/src/toolchain.rs b/kclvm/driver/src/toolchain.rs index 13774c6ed..95677f6bc 100644 --- a/kclvm/driver/src/toolchain.rs +++ b/kclvm/driver/src/toolchain.rs @@ -59,7 +59,6 @@ impl + Send + Sync> Toolchain for CommandToolchain { match Command::new(&self.path) .arg("mod") .arg("metadata") - .arg("--update") .current_dir(manifest_path) .output() { From e290b56f66096fd2d27bcca9a6bc9515cbf4d302 Mon Sep 17 00:00:00 2001 From: zongz Date: Mon, 16 Dec 2024 11:54:20 +0800 Subject: [PATCH 4/4] fix: add '--update' to metadata Signed-off-by: zongz --- kclvm/driver/src/toolchain.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/kclvm/driver/src/toolchain.rs b/kclvm/driver/src/toolchain.rs index 95677f6bc..13774c6ed 100644 --- a/kclvm/driver/src/toolchain.rs +++ b/kclvm/driver/src/toolchain.rs @@ -59,6 +59,7 @@ impl + Send + Sync> Toolchain for CommandToolchain { match Command::new(&self.path) .arg("mod") .arg("metadata") + .arg("--update") .current_dir(manifest_path) .output() {