Skip to content

Commit ab7426f

Browse files
authored
Merge pull request #275 from zong-zhe/support-git-private
feat: Support git private repo
2 parents 2dd4120 + 6aef0bd commit ab7426f

File tree

62 files changed

+1019
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1019
-328
lines changed

.github/workflows/e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: install Go
1414
uses: actions/setup-go@v2
1515
with:
16-
go-version: 1.19
16+
go-version: 1.21
1717

1818
- name: run e2e
1919
run: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Go
1919
uses: actions/setup-go@v2
2020
with:
21-
go-version: 1.19
21+
go-version: 1.21
2222
- name: Run GoReleaser
2323
uses: goreleaser/goreleaser-action@v4
2424
with:

.github/workflows/test-win.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up Go
1515
uses: actions/setup-go@v2
1616
with:
17-
go-version: 1.19
17+
go-version: 1.21
1818

1919
- name: Install Chocolatey and make
2020
run: |

.github/workflows/test.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
uses: actions/checkout@v2
1313
with:
1414
fetch-depth: 0
15-
- name: Set up Go 1.19
15+
- name: Set up Go 1.21
1616
uses: actions/setup-go@v2
1717
with:
18-
go-version: 1.19
18+
go-version: 1.21
1919

2020
- run: go build ./...
2121
- run: go vet ./...
@@ -37,13 +37,13 @@ jobs:
3737
uses: actions/checkout@v2
3838
with:
3939
fetch-depth: 0
40-
- name: Set up Go 1.19
40+
- name: Set up Go 1.21
4141
uses: actions/setup-go@v2
4242
with:
43-
go-version: 1.19
43+
go-version: 1.21
4444
- name: golangci-lint
4545
uses: golangci/golangci-lint-action@v3
4646
with:
4747
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
48-
version: v1.50.1
49-
timeout: 5m
48+
version: v1.55.2
49+
args: --timeout=10m

docs/push_by_github_action-zh.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ jobs:
6565
- name: Checkout
6666
uses: actions/checkout@v2
6767

68-
- name: Set up Go 1.19
68+
- name: Set up Go 1.21
6969
uses: actions/setup-go@v2
7070
with:
71-
go-version: 1.19
71+
go-version: 1.21
7272

7373
- name: Install kpm
7474
run: go install kcl-lang.io/kpm@latest

docs/push_by_github_action.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ jobs:
6262
- name: Checkout
6363
uses: actions/checkout@v2
6464

65-
- name: Set up Go 1.19
65+
- name: Set up Go 1.21
6666
uses: actions/setup-go@v2
6767
with:
68-
go-version: 1.19
68+
go-version: 1.21
6969

7070
- name: Install kpm
7171
run: go install kcl-lang.io/kpm@latest

go.mod

Lines changed: 60 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
11
module kcl-lang.io/kpm
22

3-
go 1.19
3+
go 1.21
4+
5+
toolchain go1.21.5
46

57
require (
68
github.com/BurntSushi/toml v1.2.1
79
github.com/docker/distribution v2.8.2+incompatible
10+
github.com/dominikbraun/graph v0.23.0
811
github.com/opencontainers/image-spec v1.1.0-rc4
912
github.com/otiai10/copy v1.9.0
1013
github.com/sirupsen/logrus v1.9.0
1114
github.com/urfave/cli/v2 v2.25.0
1215
gotest.tools/v3 v3.4.0
13-
kcl-lang.io/kcl-go v0.7.1
16+
kcl-lang.io/kcl-go v0.8.0
1417
)
1518

1619
require (
20+
cloud.google.com/go v0.112.0 // indirect
21+
cloud.google.com/go/compute v1.23.3 // indirect
22+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
23+
cloud.google.com/go/iam v1.1.5 // indirect
24+
cloud.google.com/go/storage v1.36.0 // indirect
1725
dario.cat/mergo v1.0.0 // indirect
1826
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
1927
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2028
github.com/Microsoft/go-winio v0.6.1 // indirect
2129
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
30+
github.com/aws/aws-sdk-go v1.44.122 // indirect
2231
github.com/bahlo/generic-list-go v0.2.0 // indirect
2332
github.com/beorn7/perks v1.0.1 // indirect
33+
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2434
github.com/buger/jsonparser v1.1.1 // indirect
2535
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2636
github.com/chai2010/jsonv v1.1.3 // indirect
2737
github.com/chai2010/protorpc v1.1.4 // indirect
28-
github.com/cloudflare/circl v1.3.3 // indirect
38+
github.com/cloudflare/circl v1.3.7 // indirect
2939
github.com/containerd/containerd v1.7.0 // indirect
3040
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
3141
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -35,35 +45,50 @@ require (
3545
github.com/docker/go-connections v0.4.0 // indirect
3646
github.com/docker/go-metrics v0.0.1 // indirect
3747
github.com/docker/go-units v0.5.0 // indirect
38-
github.com/dominikbraun/graph v0.23.0 // indirect
3948
github.com/emirpasic/gods v1.18.1 // indirect
4049
github.com/fatih/color v1.10.0 // indirect
50+
github.com/felixge/httpsnoop v1.0.4 // indirect
51+
github.com/getkin/kin-openapi v0.123.0 // indirect
4152
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
4253
github.com/go-git/go-billy/v5 v5.5.0 // indirect
43-
github.com/go-logr/logr v1.2.4 // indirect
54+
github.com/go-logr/logr v1.3.0 // indirect
4455
github.com/go-logr/stdr v1.2.2 // indirect
56+
github.com/go-openapi/jsonpointer v0.20.2 // indirect
57+
github.com/go-openapi/swag v0.22.8 // indirect
4558
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
46-
github.com/goccy/go-yaml v1.11.0 // indirect
59+
github.com/goccy/go-yaml v1.11.3 // indirect
4760
github.com/gogo/protobuf v1.3.2 // indirect
4861
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4962
github.com/golang/protobuf v1.5.3 // indirect
50-
github.com/golang/snappy v0.0.3 // indirect
63+
github.com/golang/snappy v0.0.4 // indirect
5164
github.com/google/go-cmp v0.6.0 // indirect
52-
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
53-
github.com/gorilla/mux v1.8.0 // indirect
65+
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
66+
github.com/google/s2a-go v0.1.7 // indirect
67+
github.com/google/uuid v1.6.0 // indirect
68+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
69+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
70+
github.com/gorilla/mux v1.8.1 // indirect
71+
github.com/hashicorp/go-safetemp v1.0.0 // indirect
5472
github.com/iancoleman/strcase v0.3.0 // indirect
73+
github.com/invopop/yaml v0.2.0 // indirect
5574
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
75+
github.com/jmespath/go-jmespath v0.4.0 // indirect
76+
github.com/josharian/intern v1.0.0 // indirect
5677
github.com/julienschmidt/httprouter v1.3.0 // indirect
5778
github.com/kevinburke/ssh_config v1.2.0 // indirect
5879
github.com/klauspost/compress v1.16.0 // indirect
5980
github.com/mailru/easyjson v0.7.7 // indirect
6081
github.com/mattn/go-colorable v0.1.8 // indirect
6182
github.com/mattn/go-isatty v0.0.12 // indirect
6283
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
84+
github.com/mitchellh/go-homedir v1.1.0 // indirect
85+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
6386
github.com/mitchellh/mapstructure v1.5.0 // indirect
6487
github.com/moby/locker v1.0.1 // indirect
88+
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
6589
github.com/morikuni/aec v1.0.0 // indirect
6690
github.com/opencontainers/go-digest v1.0.0 // indirect
91+
github.com/perimeterx/marshmallow v1.1.5 // indirect
6792
github.com/pjbgf/sha1cd v0.3.0 // indirect
6893
github.com/pkg/errors v0.9.1 // indirect
6994
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -75,37 +100,51 @@ require (
75100
github.com/qri-io/jsonpointer v0.1.1 // indirect
76101
github.com/sergi/go-diff v1.1.0 // indirect
77102
github.com/skeema/knownhosts v1.2.1 // indirect
103+
github.com/ulikunitz/xz v0.5.10 // indirect
78104
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
79105
github.com/xanzy/ssh-agent v0.3.3 // indirect
80-
go.opentelemetry.io/otel v1.14.0 // indirect
81-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
82-
golang.org/x/crypto v0.16.0 // indirect
106+
github.com/yuin/goldmark v1.7.0 // indirect
107+
go.opencensus.io v0.24.0 // indirect
108+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
109+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
110+
go.opentelemetry.io/otel v1.21.0 // indirect
111+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
112+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
113+
golang.org/x/crypto v0.18.0 // indirect
83114
golang.org/x/mod v0.12.0 // indirect
84-
golang.org/x/net v0.19.0 // indirect
85-
golang.org/x/sync v0.3.0 // indirect
86-
golang.org/x/sys v0.15.0 // indirect
115+
golang.org/x/net v0.20.0 // indirect
116+
golang.org/x/oauth2 v0.16.0 // indirect
117+
golang.org/x/sync v0.6.0 // indirect
118+
golang.org/x/sys v0.16.0 // indirect
87119
golang.org/x/text v0.14.0 // indirect
120+
golang.org/x/time v0.5.0 // indirect
88121
golang.org/x/tools v0.13.0 // indirect
89-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
90-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
91-
google.golang.org/grpc v1.56.3 // indirect
92-
google.golang.org/protobuf v1.30.0 // indirect
122+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
123+
google.golang.org/api v0.155.0 // indirect
124+
google.golang.org/appengine v1.6.8 // indirect
125+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
126+
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
127+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
128+
google.golang.org/grpc v1.62.0 // indirect
129+
google.golang.org/protobuf v1.32.0 // indirect
93130
gopkg.in/warnings.v0 v0.1.2 // indirect
94131
gopkg.in/yaml.v3 v3.0.1 // indirect
95-
kcl-lang.io/lib v0.7.3 // indirect
132+
kcl-lang.io/lib v0.8.0 // indirect
96133
)
97134

98135
require (
99136
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
100137
github.com/go-git/go-git/v5 v5.11.0
101138
github.com/gofrs/flock v0.8.1
102139
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
140+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
141+
github.com/hashicorp/go-getter v1.7.3
103142
github.com/hashicorp/go-version v1.6.0
104143
github.com/moby/term v0.0.0-20221205130635-1aeaba878587
105144
github.com/onsi/ginkgo/v2 v2.11.0
106145
github.com/onsi/gomega v1.27.10
107146
github.com/russross/blackfriday/v2 v2.1.0 // indirect
108-
github.com/stretchr/testify v1.8.4
147+
github.com/stretchr/testify v1.9.0
109148
github.com/thoas/go-funk v0.9.3
110149
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
111150
oras.land/oras-go v1.2.3

0 commit comments

Comments
 (0)