diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml deleted file mode 100644 index bdeb3cdb..00000000 --- a/.github/workflows/cla.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: "CLA Assistant" -on: - issue_comment: - types: [created] - pull_request_target: - types: [opened,closed,synchronize] -jobs: - CLAssistant: - runs-on: ubuntu-latest - steps: - - name: "CLA Assistant" - if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - uses: contributor-assistant/github-action@v2.4.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # the below token should have repo scope and must be manually added by you in the repository's secret - PERSONAL_ACCESS_TOKEN : ${{ secrets.DEPLOY_ACCESS_TOKEN }} - with: - path-to-document: 'https://github.com/kcl-lang/.github/blob/main/CLA.md' # e.g. a CLA or a DCO document - - # branch should not be protected - lock-pullrequest-aftermerge: false - path-to-signatures: 'signatures/version1/cla.json' - remote-organization-name: kcl-lang - remote-repository-name: cla.db - branch: 'main' - allowlist: bot* - - #below are the optional inputs - If the optional inputs are not given, then default values will be taken - #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) - #remote-repository-name: enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository) - #create-file-commit-message: 'For example: Creating file for storing CLA Signatures' - #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' - #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' - #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' - #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.' - #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true) - #use-dco-flag: true - If you are using DCO instead of CLA diff --git a/go.mod b/go.mod index 3f5739ac..34c4cdda 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( golang.org/x/mod v0.20.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.5.1 - kcl-lang.io/kcl-go v0.10.0-alpha.1.0.20240730084238-c647f95196d2 + kcl-lang.io/kcl-go v0.10.0-alpha.2 ) require ( @@ -61,7 +61,7 @@ require ( github.com/emirpasic/gods v1.18.1 // indirect github.com/fatih/color v1.15.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/getkin/kin-openapi v0.126.0 // indirect + github.com/getkin/kin-openapi v0.127.0 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.5.0 // indirect github.com/go-logr/logr v1.4.2 // indirect @@ -143,7 +143,7 @@ require ( google.golang.org/protobuf v1.34.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect - kcl-lang.io/lib v0.10.0-alpha.1 // indirect + kcl-lang.io/lib v0.10.0-alpha.2.0.20240805133606-f538c9780908 // indirect ) require ( diff --git a/go.sum b/go.sum index e096e2d3..71678a36 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/getkin/kin-openapi v0.126.0 h1:c2cSgLnAsS0xYfKsgt5oBV6MYRM/giU8/RtwUY4wyfY= -github.com/getkin/kin-openapi v0.126.0/go.mod h1:7mONz8IwmSRg6RttPu6v8U/OJ+gr+J99qSFNjPGSQqw= +github.com/getkin/kin-openapi v0.127.0 h1:Mghqi3Dhryf3F8vR370nN67pAERW+3a95vomb3MAREY= +github.com/getkin/kin-openapi v0.127.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8= @@ -1326,10 +1326,10 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk= k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -kcl-lang.io/kcl-go v0.10.0-alpha.1.0.20240730084238-c647f95196d2 h1:GbX+J5OE+sPbFz2HPMD0oDHnvdJB055Il7brmY+5Wsg= -kcl-lang.io/kcl-go v0.10.0-alpha.1.0.20240730084238-c647f95196d2/go.mod h1:q1NZjPbx9XnR7gd1SEtPng82meJNx8sW/wRcRW8DGJs= -kcl-lang.io/lib v0.10.0-alpha.1 h1:GMVB75Pc1W29gcl1WlVgdgUscH6h+d9No0fzBH0rNYg= -kcl-lang.io/lib v0.10.0-alpha.1/go.mod h1:tu+tzwGgHLzYZSIxUG/ntipStrxZd6OvutWYPTxS7cs= +kcl-lang.io/kcl-go v0.10.0-alpha.2 h1:Ly5Nf9HTLRKx1DU3Vx0XxGeom5KmtcQA0R3cCkRsBhg= +kcl-lang.io/kcl-go v0.10.0-alpha.2/go.mod h1:SES7AjeZsQXGzlsk9BRT16xDRp+/nyS7N/bJkG5tuFU= +kcl-lang.io/lib v0.10.0-alpha.2.0.20240805133606-f538c9780908 h1:QxwzJ6jPxdlcTdcYdbUs+vk8w5uz5kirtihNQhXMm/I= +kcl-lang.io/lib v0.10.0-alpha.2.0.20240805133606-f538c9780908/go.mod h1:tu+tzwGgHLzYZSIxUG/ntipStrxZd6OvutWYPTxS7cs= oras.land/oras-go v1.2.6 h1:z8cmxQXBU8yZ4mkytWqXfo6tZcamPwjsuxYU81xJ8Lk= oras.land/oras-go v1.2.6/go.mod h1:OVPc1PegSEe/K8YiLfosrlqlqTN9PUyFvOw5Y9gwrT8= oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c= diff --git a/pkg/client/test_data/add_with_default_dep/no_tag/kcl.mod.bak b/pkg/client/test_data/add_with_default_dep/no_tag/kcl.mod.bak index 4b51ff95..6d4e52ed 100644 --- a/pkg/client/test_data/add_with_default_dep/no_tag/kcl.mod.bak +++ b/pkg/client/test_data/add_with_default_dep/no_tag/kcl.mod.bak @@ -1,4 +1,4 @@ [package] name = "add_with_default" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/add_with_default_dep/no_tag/kcl.mod.expect b/pkg/client/test_data/add_with_default_dep/no_tag/kcl.mod.expect index f82e4edb..4050db55 100644 --- a/pkg/client/test_data/add_with_default_dep/no_tag/kcl.mod.expect +++ b/pkg/client/test_data/add_with_default_dep/no_tag/kcl.mod.expect @@ -1,6 +1,6 @@ [package] name = "add_with_default" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/add_with_default_dep/with_tag/kcl.mod.bak b/pkg/client/test_data/add_with_default_dep/with_tag/kcl.mod.bak index 4b51ff95..6d4e52ed 100644 --- a/pkg/client/test_data/add_with_default_dep/with_tag/kcl.mod.bak +++ b/pkg/client/test_data/add_with_default_dep/with_tag/kcl.mod.bak @@ -1,4 +1,4 @@ [package] name = "add_with_default" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/add_with_default_dep/with_tag/kcl.mod.expect b/pkg/client/test_data/add_with_default_dep/with_tag/kcl.mod.expect index f82e4edb..4050db55 100644 --- a/pkg/client/test_data/add_with_default_dep/with_tag/kcl.mod.expect +++ b/pkg/client/test_data/add_with_default_dep/with_tag/kcl.mod.expect @@ -1,6 +1,6 @@ [package] name = "add_with_default" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/add_with_local_path/expect/dep_pkg/kcl.mod b/pkg/client/test_data/add_with_local_path/expect/dep_pkg/kcl.mod index fd9bae59..a6d2b4ab 100644 --- a/pkg/client/test_data/add_with_local_path/expect/dep_pkg/kcl.mod +++ b/pkg/client/test_data/add_with_local_path/expect/dep_pkg/kcl.mod @@ -1,5 +1,5 @@ [package] name = "dep_pkg" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/add_with_local_path/expect/pkg/kcl.mod b/pkg/client/test_data/add_with_local_path/expect/pkg/kcl.mod index cd18a78b..ce22bb77 100644 --- a/pkg/client/test_data/add_with_local_path/expect/pkg/kcl.mod +++ b/pkg/client/test_data/add_with_local_path/expect/pkg/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/add_with_local_path/init/dep_pkg/kcl.mod b/pkg/client/test_data/add_with_local_path/init/dep_pkg/kcl.mod index fd9bae59..a6d2b4ab 100644 --- a/pkg/client/test_data/add_with_local_path/init/dep_pkg/kcl.mod +++ b/pkg/client/test_data/add_with_local_path/init/dep_pkg/kcl.mod @@ -1,5 +1,5 @@ [package] name = "dep_pkg" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/add_with_local_path/init/pkg/kcl.mod b/pkg/client/test_data/add_with_local_path/init/pkg/kcl.mod index d85ca518..144f67ef 100644 --- a/pkg/client/test_data/add_with_local_path/init/pkg/kcl.mod +++ b/pkg/client/test_data/add_with_local_path/init/pkg/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/diffsettings/kcl.mod b/pkg/client/test_data/diffsettings/kcl.mod index 3df2474d..f8130dfb 100644 --- a/pkg/client/test_data/diffsettings/kcl.mod +++ b/pkg/client/test_data/diffsettings/kcl.mod @@ -1,6 +1,6 @@ [package] name = "diffsettings" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/expected/kcl.mod b/pkg/client/test_data/expected/kcl.mod index 328d8700..c35d627c 100644 --- a/pkg/client/test_data/expected/kcl.mod +++ b/pkg/client/test_data/expected/kcl.mod @@ -1,6 +1,6 @@ [package] name = "test_add_deps" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/expected/kcl.reverse.mod b/pkg/client/test_data/expected/kcl.reverse.mod index d59b1142..99457e69 100644 --- a/pkg/client/test_data/expected/kcl.reverse.mod +++ b/pkg/client/test_data/expected/kcl.reverse.mod @@ -1,6 +1,6 @@ [package] name = "test_add_deps" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/run_with_default_dep/kcl.mod.bak b/pkg/client/test_data/run_with_default_dep/kcl.mod.bak index f82e4edb..4050db55 100644 --- a/pkg/client/test_data/run_with_default_dep/kcl.mod.bak +++ b/pkg/client/test_data/run_with_default_dep/kcl.mod.bak @@ -1,6 +1,6 @@ [package] name = "add_with_default" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/run_with_default_dep/kcl.mod.expect b/pkg/client/test_data/run_with_default_dep/kcl.mod.expect index f82e4edb..4050db55 100644 --- a/pkg/client/test_data/run_with_default_dep/kcl.mod.expect +++ b/pkg/client/test_data/run_with_default_dep/kcl.mod.expect @@ -1,6 +1,6 @@ [package] name = "add_with_default" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_add_local_path/dep/kcl.mod b/pkg/client/test_data/test_add_local_path/dep/kcl.mod index d86c1727..a6ab59ad 100644 --- a/pkg/client/test_data/test_add_local_path/dep/kcl.mod +++ b/pkg/client/test_data/test_add_local_path/dep/kcl.mod @@ -1,5 +1,5 @@ [package] name = "dep" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_add_local_path/kcl.mod.bak b/pkg/client/test_data/test_add_local_path/kcl.mod.bak index 665ee79e..4227842c 100644 --- a/pkg/client/test_data/test_add_local_path/kcl.mod.bak +++ b/pkg/client/test_data/test_add_local_path/kcl.mod.bak @@ -1,5 +1,5 @@ [package] name = "test_add_local_path" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_data_add_deps/kcl.mod b/pkg/client/test_data/test_data_add_deps/kcl.mod index 328d8700..909a628f 100644 --- a/pkg/client/test_data/test_data_add_deps/kcl.mod +++ b/pkg/client/test_data/test_data_add_deps/kcl.mod @@ -1,8 +1,9 @@ [package] name = "test_add_deps" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] oci_name = { oci = "oci://test_reg/test_repo", tag = "test_tag" } name = { git = "test_url", tag = "test_tag" } + diff --git a/pkg/client/test_data/test_dep_order/expect.mod b/pkg/client/test_data/test_dep_order/expect.mod index 017eca05..94a3cfa3 100644 --- a/pkg/client/test_data/test_dep_order/expect.mod +++ b/pkg/client/test_data/test_dep_order/expect.mod @@ -1,6 +1,6 @@ [package] name = "test_add_order" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_dep_order/kcl.mod b/pkg/client/test_data/test_dep_order/kcl.mod index 017eca05..94a3cfa3 100644 --- a/pkg/client/test_data/test_dep_order/kcl.mod +++ b/pkg/client/test_data/test_dep_order/kcl.mod @@ -1,6 +1,6 @@ [package] name = "test_add_order" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_init_empty_mod/kcl.mod b/pkg/client/test_data/test_init_empty_mod/kcl.mod index a23552f2..ca1c5d84 100644 --- a/pkg/client/test_data/test_init_empty_mod/kcl.mod +++ b/pkg/client/test_data/test_init_empty_mod/kcl.mod @@ -1,5 +1,6 @@ [package] name = "test_name" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" + diff --git a/pkg/client/test_data/test_oci_downloader/add_dep/pkg/except b/pkg/client/test_data/test_oci_downloader/add_dep/pkg/except index fa6ed221..10fd17db 100644 --- a/pkg/client/test_data/test_oci_downloader/add_dep/pkg/except +++ b/pkg/client/test_data/test_oci_downloader/add_dep/pkg/except @@ -1,6 +1,6 @@ [package] name = "pkg" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_oci_downloader/add_dep/pkg/kcl.mod b/pkg/client/test_data/test_oci_downloader/add_dep/pkg/kcl.mod index fa6ed221..10fd17db 100644 --- a/pkg/client/test_data/test_oci_downloader/add_dep/pkg/kcl.mod +++ b/pkg/client/test_data/test_oci_downloader/add_dep/pkg/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_oci_downloader/run_pkg/pkg/kcl.mod b/pkg/client/test_data/test_oci_downloader/run_pkg/pkg/kcl.mod index fa6ed221..10fd17db 100644 --- a/pkg/client/test_data/test_oci_downloader/run_pkg/pkg/kcl.mod +++ b/pkg/client/test_data/test_oci_downloader/run_pkg/pkg/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_parse_kcl_mod_file/kcl.mod b/pkg/client/test_data/test_parse_kcl_mod_file/kcl.mod index e69de29b..2d85265e 100644 --- a/pkg/client/test_data/test_parse_kcl_mod_file/kcl.mod +++ b/pkg/client/test_data/test_parse_kcl_mod_file/kcl.mod @@ -0,0 +1,5 @@ +[dependencies] +teleport = "0.1.0" +rabbitmq = "0.0.1" +gitdep = { git = "git://example.com/repo.git", tag = "v1.0.0" } +localdep = { path = "/path/to/local/dependency" } diff --git a/pkg/client/test_data/test_run_in_vendor/dep/kcl.mod b/pkg/client/test_data/test_run_in_vendor/dep/kcl.mod index 6cbf3cb4..7727b6b7 100644 --- a/pkg/client/test_data/test_run_in_vendor/dep/kcl.mod +++ b/pkg/client/test_data/test_run_in_vendor/dep/kcl.mod @@ -1,6 +1,6 @@ [package] name = "dep" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_run_in_vendor/pkg/kcl.mod b/pkg/client/test_data/test_run_in_vendor/pkg/kcl.mod index ec4282a5..8305a141 100644 --- a/pkg/client/test_data/test_run_in_vendor/pkg/kcl.mod +++ b/pkg/client/test_data/test_run_in_vendor/pkg/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_run_options/no_args/run_0/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_0/kcl.mod index e3bd2319..f8b4cf5b 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_0/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_0/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_0" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_run_options/no_args/run_1/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_1/kcl.mod index f7a6167c..c6d14187 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_1/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [profile] diff --git a/pkg/client/test_data/test_run_options/no_args/run_2/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_2/kcl.mod index 0276708c..78195993 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_2/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_2/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_run_options/no_args/run_3/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_3/kcl.mod index 4cccd4b9..6dea1dcf 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_3/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_3/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [profile] diff --git a/pkg/client/test_data/test_run_options/no_args/run_4/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_4/kcl.mod index 7920bcf3..d7d0f4c3 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_4/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_4/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_4" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_run_options/no_args/run_5/kcl_6/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_5/kcl_6/kcl.mod index c8e083d6..6f2c12c9 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_5/kcl_6/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_5/kcl_6/kcl.mod @@ -1,6 +1,6 @@ [package] name = "kcl_6" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_run_options/no_args/run_5/kcl_7/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_5/kcl_7/kcl.mod index d5695788..d63c14ee 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_5/kcl_7/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_5/kcl_7/kcl.mod @@ -1,6 +1,6 @@ [package] name = "kcl_7" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_run_options/no_args/run_6/main/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_6/main/kcl.mod index 52ca847d..25134ead 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_6/main/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_6/main/kcl.mod @@ -1,6 +1,6 @@ [package] name = "main" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [profile] diff --git a/pkg/client/test_data/test_run_options/no_args/run_7/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_7/kcl.mod index b1ce16cf..23ac2744 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_7/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_7/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_7" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/test_run_options/no_args/run_8/kcl.mod b/pkg/client/test_data/test_run_options/no_args/run_8/kcl.mod index dd709d72..40f9e490 100644 --- a/pkg/client/test_data/test_run_options/no_args/run_8/kcl.mod +++ b/pkg/client/test_data/test_run_options/no_args/run_8/kcl.mod @@ -1,5 +1,5 @@ [package] name = "run_8" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_run_options/with_args/run_1/kcl.mod b/pkg/client/test_data/test_run_options/with_args/run_1/kcl.mod index e3bd2319..f8b4cf5b 100644 --- a/pkg/client/test_data/test_run_options/with_args/run_1/kcl.mod +++ b/pkg/client/test_data/test_run_options/with_args/run_1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_0" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_run_options/with_args/run_3/kcl.mod b/pkg/client/test_data/test_run_options/with_args/run_3/kcl.mod index 816abb89..22e77f04 100644 --- a/pkg/client/test_data/test_run_options/with_args/run_3/kcl.mod +++ b/pkg/client/test_data/test_run_options/with_args/run_3/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [profile] diff --git a/pkg/client/test_data/test_run_options/with_args/run_4/kcl.mod b/pkg/client/test_data/test_run_options/with_args/run_4/kcl.mod index cc702726..841be41c 100644 --- a/pkg/client/test_data/test_run_options/with_args/run_4/kcl.mod +++ b/pkg/client/test_data/test_run_options/with_args/run_4/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_4" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_run_options/with_args/run_6/kcl.mod b/pkg/client/test_data/test_run_options/with_args/run_6/kcl.mod index e3bd2319..f8b4cf5b 100644 --- a/pkg/client/test_data/test_run_options/with_args/run_6/kcl.mod +++ b/pkg/client/test_data/test_run_options/with_args/run_6/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_0" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/test_run_options/with_args/run_8/kcl.mod b/pkg/client/test_data/test_run_options/with_args/run_8/kcl.mod index 816abb89..22e77f04 100644 --- a/pkg/client/test_data/test_run_options/with_args/run_8/kcl.mod +++ b/pkg/client/test_data/test_run_options/with_args/run_8/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [profile] diff --git a/pkg/client/test_data/test_run_options/with_args/run_9/kcl.mod b/pkg/client/test_data/test_run_options/with_args/run_9/kcl.mod index cc702726..841be41c 100644 --- a/pkg/client/test_data/test_run_options/with_args/run_9/kcl.mod +++ b/pkg/client/test_data/test_run_options/with_args/run_9/kcl.mod @@ -1,6 +1,6 @@ [package] name = "run_4" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/pkg/client/test_data/update_with_default_dep/kcl.mod.bak b/pkg/client/test_data/update_with_default_dep/kcl.mod.bak index f82e4edb..4050db55 100644 --- a/pkg/client/test_data/update_with_default_dep/kcl.mod.bak +++ b/pkg/client/test_data/update_with_default_dep/kcl.mod.bak @@ -1,6 +1,6 @@ [package] name = "add_with_default" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/client/test_data/update_with_default_dep/kcl.mod.expect b/pkg/client/test_data/update_with_default_dep/kcl.mod.expect index f82e4edb..4050db55 100644 --- a/pkg/client/test_data/update_with_default_dep/kcl.mod.expect +++ b/pkg/client/test_data/update_with_default_dep/kcl.mod.expect @@ -1,6 +1,6 @@ [package] name = "add_with_default" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/git/git.go b/pkg/git/git.go index 162e93f7..e5cda1c1 100644 --- a/pkg/git/git.go +++ b/pkg/git/git.go @@ -6,9 +6,9 @@ import ( "fmt" "io" "net/http" + "os/exec" "regexp" "time" - "os/exec" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" @@ -117,7 +117,7 @@ func (cloneOpts *CloneOptions) cloneBare() (*git.Repository, error) { args = append(args, "--no-checkout") } args = append(args, cloneOpts.RepoURL, cloneOpts.LocalPath) - + cmd := exec.Command("git", args...) cmd.Stdout = cloneOpts.Writer cmd.Stderr = cloneOpts.Writer @@ -141,40 +141,39 @@ func (cloneOpts *CloneOptions) cloneBare() (*git.Repository, error) { } } - return repo, nil } // CheckoutFromBare checks out the specified reference from a bare repository func (cloneOpts *CloneOptions) CheckoutFromBare() error { - if !cloneOpts.Bare { - return errors.New("repository is not bare") - } - - var reference string - - if cloneOpts.Branch != "" { - reference = "refs/heads/" + cloneOpts.Branch - } else if cloneOpts.Tag != "" { - reference = "refs/tags/" + cloneOpts.Tag - } else if cloneOpts.Commit != "" { - reference = cloneOpts.Commit - } else { - return errors.New("no reference specified for checkout") - } - - cmd := exec.Command("git", "-C", cloneOpts.LocalPath, "symbolic-ref", "HEAD", reference) - if cloneOpts.Commit != "" { - cmd = exec.Command("git", "-C", cloneOpts.LocalPath, "update-ref", "HEAD", reference) - } - cmd.Stdout = cloneOpts.Writer - cmd.Stderr = cloneOpts.Writer - - if err := cmd.Run(); err != nil { - return fmt.Errorf("failed to update HEAD in bare repository: %w", err) - } - - return nil + if !cloneOpts.Bare { + return errors.New("repository is not bare") + } + + var reference string + + if cloneOpts.Branch != "" { + reference = "refs/heads/" + cloneOpts.Branch + } else if cloneOpts.Tag != "" { + reference = "refs/tags/" + cloneOpts.Tag + } else if cloneOpts.Commit != "" { + reference = cloneOpts.Commit + } else { + return errors.New("no reference specified for checkout") + } + + cmd := exec.Command("git", "-C", cloneOpts.LocalPath, "symbolic-ref", "HEAD", reference) + if cloneOpts.Commit != "" { + cmd = exec.Command("git", "-C", cloneOpts.LocalPath, "update-ref", "HEAD", reference) + } + cmd.Stdout = cloneOpts.Writer + cmd.Stderr = cloneOpts.Writer + + if err := cmd.Run(); err != nil { + return fmt.Errorf("failed to update HEAD in bare repository: %w", err) + } + + return nil } // Clone clones a git repository diff --git a/pkg/git/git_test.go b/pkg/git/git_test.go index e9e1ff5d..9e3f3be2 100644 --- a/pkg/git/git_test.go +++ b/pkg/git/git_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "gotest.tools/v3/assert" "github.com/go-git/go-git/v5/plumbing" + "gotest.tools/v3/assert" ) func TestWithGitOptions(t *testing.T) { @@ -81,7 +81,7 @@ func TestCloneWithOptionsBare(t *testing.T) { rErr := os.RemoveAll(tmpdir) assert.NilError(t, rErr) }() - + commitSHA := "4e59d5852cd76542f9f0ec65e5773ca9f4e02462" repo, err := CloneWithOpts( WithRepoURL("https://github.com/KusionStack/catalog.git"), @@ -114,50 +114,50 @@ func TestCloneWithOptionsBare(t *testing.T) { } func TestCheckoutFromBare(t *testing.T) { - var buf bytes.Buffer - tmpdir, err := os.MkdirTemp("", "git-bare-checkout") - assert.NilError(t, err) - defer func() { - rErr := os.RemoveAll(tmpdir) - assert.NilError(t, rErr) - }() - - // First, clone a bare repository - repoURL := "https://github.com/KusionStack/catalog.git" - commitSHA := "4e59d5852cd76542f9f0ec65e5773ca9f4e02462" - - repo, err := CloneWithOpts( - WithRepoURL(repoURL), - WithWriter(&buf), - WithLocalPath(tmpdir), - WithBare(true), - ) - assert.NilError(t, err, "Failed to clone bare repository: %s", buf.String()) - - // Verify that the repository is bare - config, err := repo.Config() - assert.NilError(t, err) - assert.Equal(t, config.Core.IsBare, true, "Expected repository to be bare") - - // Now, attempt to update HEAD to a specific commit - checkoutOpts := &CloneOptions{ - RepoURL: repoURL, - LocalPath: tmpdir, - Commit: commitSHA, - Writer: &buf, - Bare: true, - } - - err = checkoutOpts.CheckoutFromBare() - assert.NilError(t, err, "Failed to update HEAD in bare repository: %s", buf.String()) - - // Verify that HEAD points to the specified commit - head, err := repo.Head() - assert.NilError(t, err) - assert.Equal(t, head.Hash().String(), commitSHA, "Expected HEAD to point to the specified commit") - - // For a bare repository, we can't check for working directory files - // Instead, we can verify that the commit exists in the repository - _, err = repo.CommitObject(plumbing.NewHash(commitSHA)) - assert.NilError(t, err, "Expected commit to exist in the repository") -} \ No newline at end of file + var buf bytes.Buffer + tmpdir, err := os.MkdirTemp("", "git-bare-checkout") + assert.NilError(t, err) + defer func() { + rErr := os.RemoveAll(tmpdir) + assert.NilError(t, rErr) + }() + + // First, clone a bare repository + repoURL := "https://github.com/KusionStack/catalog.git" + commitSHA := "4e59d5852cd76542f9f0ec65e5773ca9f4e02462" + + repo, err := CloneWithOpts( + WithRepoURL(repoURL), + WithWriter(&buf), + WithLocalPath(tmpdir), + WithBare(true), + ) + assert.NilError(t, err, "Failed to clone bare repository: %s", buf.String()) + + // Verify that the repository is bare + config, err := repo.Config() + assert.NilError(t, err) + assert.Equal(t, config.Core.IsBare, true, "Expected repository to be bare") + + // Now, attempt to update HEAD to a specific commit + checkoutOpts := &CloneOptions{ + RepoURL: repoURL, + LocalPath: tmpdir, + Commit: commitSHA, + Writer: &buf, + Bare: true, + } + + err = checkoutOpts.CheckoutFromBare() + assert.NilError(t, err, "Failed to update HEAD in bare repository: %s", buf.String()) + + // Verify that HEAD points to the specified commit + head, err := repo.Head() + assert.NilError(t, err) + assert.Equal(t, head.Hash().String(), commitSHA, "Expected HEAD to point to the specified commit") + + // For a bare repository, we can't check for working directory files + // Instead, we can verify that the commit exists in the repository + _, err = repo.CommitObject(plumbing.NewHash(commitSHA)) + assert.NilError(t, err, "Expected commit to exist in the repository") +} diff --git a/pkg/oci/test_data/test_pull/0.0.9/artifact.tgz b/pkg/oci/test_data/test_pull/0.0.9/artifact.tgz index 569979b5..989a2faa 100644 Binary files a/pkg/oci/test_data/test_pull/0.0.9/artifact.tgz and b/pkg/oci/test_data/test_pull/0.0.9/artifact.tgz differ diff --git a/pkg/package/test_data/store_mod_file/kcl.mod b/pkg/package/test_data/store_mod_file/kcl.mod index 202d01bc..cab62f23 100644 --- a/pkg/package/test_data/store_mod_file/kcl.mod +++ b/pkg/package/test_data/store_mod_file/kcl.mod @@ -3,3 +3,4 @@ name = "test_name" edition = "0.0.1" version = "0.0.1" + diff --git a/pkg/package/test_data/test_data_modfile/kcl.mod b/pkg/package/test_data/test_data_modfile/kcl.mod index fa4fb213..d8198722 100644 --- a/pkg/package/test_data/test_data_modfile/kcl.mod +++ b/pkg/package/test_data/test_data_modfile/kcl.mod @@ -1,5 +1,6 @@ [package] name = "test_kcl_pkg" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" + diff --git a/pkg/package/test_data/test_init_empty_mod/kcl.mod b/pkg/package/test_data/test_init_empty_mod/kcl.mod index a23552f2..ca1c5d84 100644 --- a/pkg/package/test_data/test_init_empty_mod/kcl.mod +++ b/pkg/package/test_data/test_init_empty_mod/kcl.mod @@ -1,5 +1,6 @@ [package] name = "test_name" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" + diff --git a/pkg/package/test_data/test_oci_url/marshal_0/kcl_mod_bk/kcl.mod b/pkg/package/test_data/test_oci_url/marshal_0/kcl_mod_bk/kcl.mod index 623f27fb..82117f5a 100644 --- a/pkg/package/test_data/test_oci_url/marshal_0/kcl_mod_bk/kcl.mod +++ b/pkg/package/test_data/test_oci_url/marshal_0/kcl_mod_bk/kcl.mod @@ -1,6 +1,6 @@ [package] name = "marshal_0" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/package/test_data/test_oci_url/marshal_1/expect.mod b/pkg/package/test_data/test_oci_url/marshal_1/expect.mod index 8afcdaf9..69576ce3 100644 --- a/pkg/package/test_data/test_oci_url/marshal_1/expect.mod +++ b/pkg/package/test_data/test_oci_url/marshal_1/expect.mod @@ -1,6 +1,6 @@ [package] name = "marshal_1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/package/test_data/test_oci_url/marshal_1/kcl.mod b/pkg/package/test_data/test_oci_url/marshal_1/kcl.mod index 82d64601..050ec27e 100644 --- a/pkg/package/test_data/test_oci_url/marshal_1/kcl.mod +++ b/pkg/package/test_data/test_oci_url/marshal_1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "marshal_1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/package/test_data/test_oci_url/marshal_2/expect.mod b/pkg/package/test_data/test_oci_url/marshal_2/expect.mod index 0d92bf69..966c7452 100644 --- a/pkg/package/test_data/test_oci_url/marshal_2/expect.mod +++ b/pkg/package/test_data/test_oci_url/marshal_2/expect.mod @@ -1,6 +1,6 @@ [package] name = "marshal_2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/package/test_data/test_oci_url/marshal_2/kcl.mod b/pkg/package/test_data/test_oci_url/marshal_2/kcl.mod index 0d92bf69..966c7452 100644 --- a/pkg/package/test_data/test_oci_url/marshal_2/kcl.mod +++ b/pkg/package/test_data/test_oci_url/marshal_2/kcl.mod @@ -1,6 +1,6 @@ [package] name = "marshal_2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/package/test_data/test_oci_url/marshal_3/expect.mod b/pkg/package/test_data/test_oci_url/marshal_3/expect.mod index 534291b4..3143a17c 100644 --- a/pkg/package/test_data/test_oci_url/marshal_3/expect.mod +++ b/pkg/package/test_data/test_oci_url/marshal_3/expect.mod @@ -1,6 +1,6 @@ [package] name = "marshal_3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/package/test_data/test_oci_url/marshal_3/kcl.mod b/pkg/package/test_data/test_oci_url/marshal_3/kcl.mod index 534291b4..3143a17c 100644 --- a/pkg/package/test_data/test_oci_url/marshal_3/kcl.mod +++ b/pkg/package/test_data/test_oci_url/marshal_3/kcl.mod @@ -1,6 +1,6 @@ [package] name = "marshal_3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/package/test_data/test_oci_url/unmarshal_0/kcl.mod b/pkg/package/test_data/test_oci_url/unmarshal_0/kcl.mod index 09dee7ff..fd310014 100644 --- a/pkg/package/test_data/test_oci_url/unmarshal_0/kcl.mod +++ b/pkg/package/test_data/test_oci_url/unmarshal_0/kcl.mod @@ -1,6 +1,6 @@ [package] name = "marshal_0" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/package/test_data/test_oci_url/unmarshal_1/kcl.mod b/pkg/package/test_data/test_oci_url/unmarshal_1/kcl.mod index 31928766..0b5ac597 100644 --- a/pkg/package/test_data/test_oci_url/unmarshal_1/kcl.mod +++ b/pkg/package/test_data/test_oci_url/unmarshal_1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "marshal_1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/pkg/package/toml_test.go b/pkg/package/toml_test.go index f33a7764..ec362101 100644 --- a/pkg/package/toml_test.go +++ b/pkg/package/toml_test.go @@ -224,7 +224,7 @@ func TestMarshalOciUrl(t *testing.T) { modfile := ModFile{ Pkg: Package{ Name: "marshal_0", - Edition: "v0.9.0", + Edition: "v0.10.0", Version: "0.0.1", }, Dependencies: Dependencies{ diff --git a/pkg/version/version.go b/pkg/version/version.go index fb285e26..c22631c8 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -26,36 +26,37 @@ func (kvt KpmVersionType) String() string { // All the kpm versions. const ( - KpmAbiVersion KpmVersionType = KpmAbiVersion_0_9_0 - KpmVersionType_latest = KpmAbiVersion_0_9_0 + KpmAbiVersion KpmVersionType = KpmAbiVersion_0_10_0 + KpmVersionType_latest = KpmAbiVersion_0_10_0 - KpmAbiVersion_0_9_0 KpmVersionType = "0.9.0" - KpmAbiVersion_0_8_0 KpmVersionType = "0.8.0" - KpmAbiVersion_0_7_0 KpmVersionType = "0.7.0" - KpmAbiVersion_0_6_0 KpmVersionType = "0.6.0" - KpmAbiVersion_0_5_0 KpmVersionType = "0.5.0" - KpmAbiVersion_0_4_7 KpmVersionType = "0.4.7" - KpmAbiVersion_0_4_6 KpmVersionType = "0.4.6" - KpmAbiVersion_0_4_5 KpmVersionType = "0.4.5" - KpmAbiVersion_0_4_4 KpmVersionType = "0.4.4" - KpmAbiVersion_0_4_3 KpmVersionType = "0.4.3" - KpmAbiVersion_0_4_2 KpmVersionType = "0.4.2" - KpmAbiVersion_0_4_1 KpmVersionType = "0.4.1" - KpmAbiVersion_0_4_0 KpmVersionType = "0.4.0" - KpmAbiVersion_0_3_7 KpmVersionType = "0.3.7" - KpmAbiVersion_0_3_6 KpmVersionType = "0.3.6" - KpmAbiVersion_0_3_5 KpmVersionType = "0.3.5" - KpmAbiVersion_0_3_4 KpmVersionType = "0.3.4" - KpmAbiVersion_0_3_3 KpmVersionType = "0.3.3" - KpmAbiVersion_0_3_2 KpmVersionType = "0.3.2" - KpmAbiVersion_0_3_1 KpmVersionType = "0.3.1" - KpmAbiVersion_0_3_0 KpmVersionType = "0.3.0" - KpmAbiVersion_0_2_6 KpmVersionType = "0.2.6" - KpmAbiVersion_0_2_5 KpmVersionType = "0.2.5" - KpmAbiVersion_0_2_4 KpmVersionType = "0.2.4" - KpmAbiVersion_0_2_3 KpmVersionType = "0.2.3" - KpmAbiVersion_0_2_2 KpmVersionType = "0.2.2" - KpmAbiVersion_0_2_1 KpmVersionType = "0.2.1" - KpmAbiVersion_0_2_0 KpmVersionType = "0.2.0" - KpmAbiVersion_0_1_0 KpmVersionType = "0.1.0" + KpmAbiVersion_0_10_0 KpmVersionType = "0.10.0" + KpmAbiVersion_0_9_0 KpmVersionType = "0.9.0" + KpmAbiVersion_0_8_0 KpmVersionType = "0.8.0" + KpmAbiVersion_0_7_0 KpmVersionType = "0.7.0" + KpmAbiVersion_0_6_0 KpmVersionType = "0.6.0" + KpmAbiVersion_0_5_0 KpmVersionType = "0.5.0" + KpmAbiVersion_0_4_7 KpmVersionType = "0.4.7" + KpmAbiVersion_0_4_6 KpmVersionType = "0.4.6" + KpmAbiVersion_0_4_5 KpmVersionType = "0.4.5" + KpmAbiVersion_0_4_4 KpmVersionType = "0.4.4" + KpmAbiVersion_0_4_3 KpmVersionType = "0.4.3" + KpmAbiVersion_0_4_2 KpmVersionType = "0.4.2" + KpmAbiVersion_0_4_1 KpmVersionType = "0.4.1" + KpmAbiVersion_0_4_0 KpmVersionType = "0.4.0" + KpmAbiVersion_0_3_7 KpmVersionType = "0.3.7" + KpmAbiVersion_0_3_6 KpmVersionType = "0.3.6" + KpmAbiVersion_0_3_5 KpmVersionType = "0.3.5" + KpmAbiVersion_0_3_4 KpmVersionType = "0.3.4" + KpmAbiVersion_0_3_3 KpmVersionType = "0.3.3" + KpmAbiVersion_0_3_2 KpmVersionType = "0.3.2" + KpmAbiVersion_0_3_1 KpmVersionType = "0.3.1" + KpmAbiVersion_0_3_0 KpmVersionType = "0.3.0" + KpmAbiVersion_0_2_6 KpmVersionType = "0.2.6" + KpmAbiVersion_0_2_5 KpmVersionType = "0.2.5" + KpmAbiVersion_0_2_4 KpmVersionType = "0.2.4" + KpmAbiVersion_0_2_3 KpmVersionType = "0.2.3" + KpmAbiVersion_0_2_2 KpmVersionType = "0.2.2" + KpmAbiVersion_0_2_1 KpmVersionType = "0.2.1" + KpmAbiVersion_0_2_0 KpmVersionType = "0.2.0" + KpmAbiVersion_0_1_0 KpmVersionType = "0.1.0" ) diff --git a/pkg/version/version_test.go b/pkg/version/version_test.go index d674b21e..188a2f84 100644 --- a/pkg/version/version_test.go +++ b/pkg/version/version_test.go @@ -12,7 +12,7 @@ func TestGetVersionInStr(t *testing.T) { }{ { name: "test get version in string", - want: "0.9.0", + want: "0.10.0", }, } for _, tt := range tests { diff --git a/test/e2e/test_suites/test_data/test_add_with_name/kcl.mod b/test/e2e/test_suites/test_data/test_add_with_name/kcl.mod index c0cdbd8e..04976103 100644 --- a/test/e2e/test_suites/test_data/test_add_with_name/kcl.mod +++ b/test/e2e/test_suites/test_data/test_add_with_name/kcl.mod @@ -1,6 +1,6 @@ [package] name = "test_add_with_name" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_add_with_url/kcl.mod b/test/e2e/test_suites/test_data/test_add_with_url/kcl.mod index 98ad08b6..9bb60612 100644 --- a/test/e2e/test_suites/test_data/test_add_with_url/kcl.mod +++ b/test/e2e/test_suites/test_data/test_add_with_url/kcl.mod @@ -1,5 +1,5 @@ [package] name = "test_add_with_url" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_add_with_url_0/kcl.mod b/test/e2e/test_suites/test_data/test_add_with_url_0/kcl.mod index 2b167892..4792d51f 100644 --- a/test/e2e/test_suites/test_data/test_add_with_url_0/kcl.mod +++ b/test/e2e/test_suites/test_data/test_add_with_url_0/kcl.mod @@ -1,4 +1,4 @@ [package] name = "test_add_with_url" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_add_with_url_1/kcl.mod b/test/e2e/test_suites/test_data/test_add_with_url_1/kcl.mod index 98ad08b6..9bb60612 100644 --- a/test/e2e/test_suites/test_data/test_add_with_url_1/kcl.mod +++ b/test/e2e/test_suites/test_data/test_add_with_url_1/kcl.mod @@ -1,5 +1,5 @@ [package] name = "test_add_with_url" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg1/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg1/kcl.mod index c873a895..e2bced36 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg1/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg2/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg2/kcl.mod index 7ba2fbec..80a134ec 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg2/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg2/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg3/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg3/kcl.mod index 97a1b7be..c5a57aaa 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg3/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path/pkg3/kcl.mod @@ -1,5 +1,5 @@ [package] name = "pkg3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg/pkg2/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg/pkg2/kcl.mod index 7ba2fbec..80a134ec 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg/pkg2/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg/pkg2/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg/pkg3/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg/pkg3/kcl.mod index 97a1b7be..c5a57aaa 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg/pkg3/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg/pkg3/kcl.mod @@ -1,5 +1,5 @@ [package] name = "pkg3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg1/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg1/kcl.mod index bf9e51ea..90378636 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg1/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_0/pkg1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg/pkg2/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg/pkg2/kcl.mod index 7ba2fbec..80a134ec 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg/pkg2/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg/pkg2/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg/pkg3/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg/pkg3/kcl.mod index 97a1b7be..c5a57aaa 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg/pkg3/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg/pkg3/kcl.mod @@ -1,5 +1,5 @@ [package] name = "pkg3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg1/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg1/kcl.mod index bf9e51ea..90378636 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg1/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_1/pkg1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg/pkg2/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg/pkg2/kcl.mod index 7ba2fbec..80a134ec 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg/pkg2/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg/pkg2/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg/pkg3/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg/pkg3/kcl.mod index 97a1b7be..c5a57aaa 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg/pkg3/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg/pkg3/kcl.mod @@ -1,5 +1,5 @@ [package] name = "pkg3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg1/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg1/kcl.mod index bf9e51ea..90378636 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg1/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_2/pkg1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg/pkg2/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg/pkg2/kcl.mod index 7ba2fbec..80a134ec 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg/pkg2/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg/pkg2/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg/pkg3/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg/pkg3/kcl.mod index 97a1b7be..c5a57aaa 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg/pkg3/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg/pkg3/kcl.mod @@ -1,5 +1,5 @@ [package] name = "pkg3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg1/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg1/kcl.mod index bf9e51ea..90378636 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg1/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_3/pkg1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg/pkg2/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg/pkg2/kcl.mod index 7ba2fbec..80a134ec 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg/pkg2/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg/pkg2/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg/pkg3/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg/pkg3/kcl.mod index 97a1b7be..c5a57aaa 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg/pkg3/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg/pkg3/kcl.mod @@ -1,5 +1,5 @@ [package] name = "pkg3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg1/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg1/kcl.mod index bf9e51ea..90378636 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg1/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_4/pkg1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg/pkg/pkg3/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg/pkg/pkg3/kcl.mod index 97a1b7be..c5a57aaa 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg/pkg/pkg3/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg/pkg/pkg3/kcl.mod @@ -1,5 +1,5 @@ [package] name = "pkg3" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg/pkg2/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg/pkg2/kcl.mod index 40ba07e4..2a632b0a 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg/pkg2/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg/pkg2/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg2" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg1/kcl.mod b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg1/kcl.mod index bf9e51ea..90378636 100644 --- a/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg1/kcl.mod +++ b/test/e2e/test_suites/test_data/test_kpm_run_multi_local_path_5/pkg1/kcl.mod @@ -1,6 +1,6 @@ [package] name = "pkg1" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1" [dependencies] diff --git a/test/e2e/test_suites/test_data/test_push_localhost/kcl.mod b/test/e2e/test_suites/test_data/test_push_localhost/kcl.mod index 6fd01805..cafccc08 100644 --- a/test/e2e/test_suites/test_data/test_push_localhost/kcl.mod +++ b/test/e2e/test_suites/test_data/test_push_localhost/kcl.mod @@ -1,6 +1,6 @@ [package] name = "helloworld" -edition = "v0.9.0" +edition = "v0.10.0" version = "0.0.1"