From 8a320f56dc3f2340139eb342f3dd548a65329027 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Fri, 16 Dec 2022 13:53:50 +0000 Subject: [PATCH] Minor cleanup + kokoro ubuntu fix (#86) * tools: Minor clean up of protocol_gen.go * Fix kokoro/ubuntu builds --- kokoro/ubuntu/presubmit-docker.sh | 3 +++ tools/protocol_gen/protocol_gen.go | 15 +++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/kokoro/ubuntu/presubmit-docker.sh b/kokoro/ubuntu/presubmit-docker.sh index 491b9ab..c9caae2 100755 --- a/kokoro/ubuntu/presubmit-docker.sh +++ b/kokoro/ubuntu/presubmit-docker.sh @@ -22,6 +22,9 @@ set -x # Display commands being run. cd github/cppdap +# Silence "fatal: unsafe repository" errors +git config --global --add safe.directory '*' + git submodule update --init if [ "$BUILD_SYSTEM" == "cmake" ]; then diff --git a/tools/protocol_gen/protocol_gen.go b/tools/protocol_gen/protocol_gen.go index c32e56b..22bae31 100644 --- a/tools/protocol_gen/protocol_gen.go +++ b/tools/protocol_gen/protocol_gen.go @@ -488,19 +488,18 @@ func (r *root) getType(def *definition) (builtType cppType, err error) { } if len(def.OneOf) != 0 { - args := []string{} - deps := []cppType{} - for i := 0; i < len(def.OneOf); i++ { - if def.OneOf[i] == nil { + args := make([]string, len(def.OneOf)) + deps := make([]cppType, len(def.OneOf)) + for i, oneOf := range def.OneOf { + if oneOf == nil { return nil, fmt.Errorf("Item %d in oneOf is nil", i) } - - elTy, err := r.getType(def.OneOf[i]) + elTy, err := r.getType(oneOf) if err != nil { return nil, err } - deps = append(deps, elTy) - args = append(args, elTy.Name()) + deps[i] = elTy + args[i] = elTy.Name() } return &cppBasicType{ name: "variant<" + strings.Join(args, ", ") + ">",