From 94d9905749074059dffcd9a78f6ea2c148b5fec6 Mon Sep 17 00:00:00 2001 From: Sylvain Afchain Date: Wed, 25 Sep 2019 10:59:14 +0200 Subject: [PATCH] ci: git reset between commits to avoid version conflict due to go.mod update --- api/types/types_easyjson.go | 109 +++----------------------------- scripts/ci/run-compile-tests.sh | 8 +++ 2 files changed, 16 insertions(+), 101 deletions(-) diff --git a/api/types/types_easyjson.go b/api/types/types_easyjson.go index 471962150a..36df6f9cf4 100644 --- a/api/types/types_easyjson.go +++ b/api/types/types_easyjson.go @@ -7,7 +7,6 @@ import ( easyjson "github.com/mailru/easyjson" jlexer "github.com/mailru/easyjson/jlexer" jwriter "github.com/mailru/easyjson/jwriter" - graph "github.com/skydive-project/skydive/graffiti/graph" ) // suppress unused package warning @@ -481,8 +480,8 @@ func easyjson6601e8cdDecodeGithubComSkydiveProjectSkydiveApiTypes4(in *jlexer.Le out.Count = uint64(in.Uint64()) case "Interval": out.Interval = uint64(in.Uint64()) - case "Increment": - out.Increment = bool(in.Bool()) + case "Mode": + out.Mode = string(in.String()) case "IncrementPayload": out.IncrementPayload = int64(in.Int64()) case "StartTime": @@ -580,9 +579,9 @@ func easyjson6601e8cdEncodeGithubComSkydiveProjectSkydiveApiTypes4(out *jwriter. out.Uint64(uint64(in.Interval)) } { - const prefix string = ",\"Increment\":" + const prefix string = ",\"Mode\":" out.RawString(prefix) - out.Bool(bool(in.Increment)) + out.String(string(in.Mode)) } { const prefix string = ",\"IncrementPayload\":" @@ -659,31 +658,7 @@ func easyjson6601e8cdDecodeGithubComSkydiveProjectSkydiveApiTypes5(in *jlexer.Le case "Description": out.Description = string(in.String()) case "Metadata": - if in.IsNull() { - in.Skip() - } else { - in.Delim('{') - if !in.IsDelim('}') { - out.Metadata = make(graph.Metadata) - } else { - out.Metadata = nil - } - for !in.IsDelim('}') { - key := string(in.String()) - in.WantColon() - var v10 interface{} - if m, ok := v10.(easyjson.Unmarshaler); ok { - m.UnmarshalEasyJSON(in) - } else if m, ok := v10.(json.Unmarshaler); ok { - _ = m.UnmarshalJSON(in.Raw()) - } else { - v10 = in.Interface() - } - (out.Metadata)[key] = v10 - in.WantComma() - } - in.Delim('}') - } + (out.Metadata).UnmarshalEasyJSON(in) case "Action": out.Action = string(in.String()) case "Query": @@ -717,29 +692,7 @@ func easyjson6601e8cdEncodeGithubComSkydiveProjectSkydiveApiTypes5(out *jwriter. { const prefix string = ",\"Metadata\":" out.RawString(prefix) - if in.Metadata == nil && (out.Flags&jwriter.NilMapAsEmpty) == 0 { - out.RawString(`null`) - } else { - out.RawByte('{') - v11First := true - for v11Name, v11Value := range in.Metadata { - if v11First { - v11First = false - } else { - out.RawByte(',') - } - out.String(string(v11Name)) - out.RawByte(':') - if m, ok := v11Value.(easyjson.Marshaler); ok { - m.MarshalEasyJSON(out) - } else if m, ok := v11Value.(json.Marshaler); ok { - out.Raw(m.MarshalJSON()) - } else { - out.Raw(json.Marshal(v11Value)) - } - } - out.RawByte('}') - } + (in.Metadata).MarshalEasyJSON(out) } { const prefix string = ",\"Action\":" @@ -810,31 +763,7 @@ func easyjson6601e8cdDecodeGithubComSkydiveProjectSkydiveApiTypes6(in *jlexer.Le case "Dst": out.Dst = string(in.String()) case "Metadata": - if in.IsNull() { - in.Skip() - } else { - in.Delim('{') - if !in.IsDelim('}') { - out.Metadata = make(graph.Metadata) - } else { - out.Metadata = nil - } - for !in.IsDelim('}') { - key := string(in.String()) - in.WantColon() - var v12 interface{} - if m, ok := v12.(easyjson.Unmarshaler); ok { - m.UnmarshalEasyJSON(in) - } else if m, ok := v12.(json.Unmarshaler); ok { - _ = m.UnmarshalJSON(in.Raw()) - } else { - v12 = in.Interface() - } - (out.Metadata)[key] = v12 - in.WantComma() - } - in.Delim('}') - } + (out.Metadata).UnmarshalEasyJSON(in) case "UUID": out.UUID = string(in.String()) default: @@ -874,29 +803,7 @@ func easyjson6601e8cdEncodeGithubComSkydiveProjectSkydiveApiTypes6(out *jwriter. { const prefix string = ",\"Metadata\":" out.RawString(prefix) - if in.Metadata == nil && (out.Flags&jwriter.NilMapAsEmpty) == 0 { - out.RawString(`null`) - } else { - out.RawByte('{') - v13First := true - for v13Name, v13Value := range in.Metadata { - if v13First { - v13First = false - } else { - out.RawByte(',') - } - out.String(string(v13Name)) - out.RawByte(':') - if m, ok := v13Value.(easyjson.Marshaler); ok { - m.MarshalEasyJSON(out) - } else if m, ok := v13Value.(json.Marshaler); ok { - out.Raw(m.MarshalJSON()) - } else { - out.Raw(json.Marshal(v13Value)) - } - } - out.RawByte('}') - } + (in.Metadata).MarshalEasyJSON(out) } { const prefix string = ",\"UUID\":" diff --git a/scripts/ci/run-compile-tests.sh b/scripts/ci/run-compile-tests.sh index 8b4121929c..aad698dabc 100755 --- a/scripts/ci/run-compile-tests.sh +++ b/scripts/ci/run-compile-tests.sh @@ -17,27 +17,34 @@ COLLECTD_SRC=/tmp/collectd make contribs # Compile with default options make + +git reset --hard make test.functionals.compile TAGS=${TAGS} export CGO_CFLAGS="-I/usr/local/include/dpdk -O3 -g -std=gnu11 -m64 -pthread -march=native -DRTE_MACHINE_CPUFLAG_SSE -DRTE_MACHINE_CPUFLAG_SSE2 -DRTE_MACHINE_CPUFLAG_SSE3 -DRTE_MACHINE_CPUFLAG_SSSE3 -DRTE_MACHINE_CPUFLAG_SSE4_1 -DRTE_MACHINE_CPUFLAG_SSE4_2 -DRTE_MACHINE_CPUFLAG_PCLMULQDQ -DRTE_MACHINE_CPUFLAG_RDRAND -DRTE_MACHINE_CPUFLAG_FSGSBASE -DRTE_MACHINE_CPUFLAG_F16C -include rte_config.h -Wno-deprecated-declarations" export CGO_LDFLAGS="-L/usr/local/lib" # Compile with all build options supported enabled +git reset --hard make WITH_DPDK=true WITH_EBPF=true WITH_VPP=true WITH_EBPF_DOCKER_BUILDER=true WITH_K8S=true WITH_ISTIO=true \ WITH_HELM=true VERBOSE=true # Compile Skydive for Windows +git reset --hard GO111MODULE=on GOOS=windows GOARCH=amd64 go build github.com/skydive-project/skydive # Compile Skydive for MacOS +git reset --hard GO111MODULE=on GOOS=darwin GOARCH=amd64 go build github.com/skydive-project/skydive # Compile profiling +git reset --hard make WITH_PROF=true VERBOSE=true make clean # Compile all tests +git reset --hard make test.functionals.compile TAGS=${TAGS} WITH_NEUTRON=true WITH_SELENIUM=true WITH_CDD=true \ WITH_SCALE=true WITH_EBPF=true WITH_EBPF_DOCKER_BUILDER=true WITH_VPP=true WITH_K8S=true \ WITH_ISTIO=true WITH_HELM=true @@ -45,4 +52,5 @@ make test.functionals.compile TAGS=${TAGS} WITH_NEUTRON=true WITH_SELENIUM=true make clean # Compile static +git reset --hard make static