You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ho...@apache.org on 2021/02/06 12:56:56 UTC
[skywalking-infra-e2e] 01/04: merge poc and resolve conflicts
This is an automated email from the ASF dual-hosted git repository.
hoshea pushed a commit to branch verifier
in repository https://gitbox.apache.org/repos/asf/skywalking-infra-e2e.git
commit 5dd520b0e67babe45dfff612b1470803924f85a4
Merge: eccd48c 7c64325
Author: Hoshea <fg...@gmail.com>
AuthorDate: Fri Feb 5 10:51:13 2021 +0800
merge poc and resolve conflicts
.golangci.yml | 2 +
.licenserc.yaml | 1 +
Makefile | 4 +-
go.mod | 2 +
test.go | 142 +++++
third-party/internal/fmtsort/sort.go | 220 +++++++
third-party/template/exec.go | 1079 ++++++++++++++++++++++++++++++++++
third-party/template/funcs.go | 769 ++++++++++++++++++++++++
third-party/template/helper.go | 130 ++++
third-party/template/option.go | 74 +++
third-party/template/parse/lex.go | 667 +++++++++++++++++++++
third-party/template/parse/node.go | 957 ++++++++++++++++++++++++++++++
third-party/template/parse/parse.go | 740 +++++++++++++++++++++++
third-party/template/template.go | 229 ++++++++
14 files changed, 5014 insertions(+), 2 deletions(-)
diff --cc .golangci.yml
index 4535951,4535951..617deaf
--- a/.golangci.yml
+++ b/.golangci.yml
@@@ -18,6 -18,6 +18,8 @@@
run:
tests: false
++ skip-dirs:
++ - third-party
linters-settings:
govet:
diff --cc .licenserc.yaml
index 45f9a41,45f9a41..9c7b73f
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@@ -69,5 -69,5 +69,6 @@@ header: # `header` section is configura
- '**/go.sum'
- 'LICENSE'
- 'NOTICE'
++ - 'third-party'
comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.
diff --cc Makefile
index c1db858,09c0fc8..1eee4be
--- a/Makefile
+++ b/Makefile
@@@ -36,7 -36,7 +36,7 @@@ ARCH = amd6
RELEASE_BIN = skywalking-$(PROJECT)-$(VERSION)-bin
RELEASE_SRC = skywalking-$(PROJECT)-$(VERSION)-src
--all: clean lint license test build
++all: clean lint test build
.PHONY: lint
lint:
@@@ -68,7 -68,7 +68,7 @@@ clean
-rm -rf "$(RELEASE_SRC)"*
.PHONY: verify
--verify: clean license lint test
++verify: clean lint test
release-src: clean
-mkdir $(RELEASE_SRC)
diff --cc go.mod
index 30c2d57,6e50f12..1430167
--- a/go.mod
+++ b/go.mod
@@@ -3,23 -3,11 +3,25 @@@ module github.com/apache/skywalking-inf
go 1.13
require (
+ github.com/Microsoft/go-winio v0.4.16 // indirect
+ github.com/containerd/containerd v1.4.3 // indirect
+ github.com/docker/docker v20.10.3+incompatible
+ github.com/docker/go-connections v0.4.0 // indirect
+ github.com/docker/go-units v0.4.0 // indirect
+ github.com/google/go-cmp v0.4.0
+ github.com/gorilla/mux v1.8.0 // indirect
+ github.com/imdario/mergo v0.3.11 // indirect
+ github.com/morikuni/aec v1.0.0 // indirect
+ github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/sirupsen/logrus v1.7.0
github.com/spf13/cobra v1.1.1
gopkg.in/yaml.v2 v2.3.0
+ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
- k8s.io/apimachinery v0.19.0 // indirect
+ k8s.io/api v0.19.0
+ k8s.io/apimachinery v0.19.0
+ k8s.io/cli-runtime v0.19.0
+ k8s.io/client-go v0.19.0
+ k8s.io/kubectl v0.19.0
+ k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
sigs.k8s.io/kind v0.9.0
)