From d9643280a7f6d8e19357fffb876718526e1b6982 Mon Sep 17 00:00:00 2001 From: Walter Schulze Date: Thu, 16 Jan 2025 16:27:55 +0000 Subject: [PATCH] update go protoc and versions of go deps --- .github/workflows/build.yml | 2 +- Makefile | 2 +- go.mod | 10 +++++++--- go.sum | 14 ++++++++++---- install_protoc.sh | 4 ++-- validator/gen-validator-tests/bench.go | 6 +++--- .../valid.main.BananaTuple.desc.pb | Bin 152 -> 197 bytes 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index abe2f80..dd5a2e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.22 + go-version: 1.23 - name: Fetch dependencies run: | cd gopath/github.com/katydid/testsuite diff --git a/Makefile b/Makefile index 5684015..8f031c9 100644 --- a/Makefile +++ b/Makefile @@ -8,4 +8,4 @@ regenerate-tests: (cd validator && make regenerate-tests) regenerate-all: - (cd validator && make regenerate) + (cd validator && make regenerate-all) diff --git a/go.mod b/go.mod index a252aca..85f3348 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,13 @@ module github.com/katydid/testsuite -go 1.22 +go 1.23 require ( github.com/gogo/protobuf v1.3.2 - github.com/katydid/validator-go v0.4.0 - github.com/katydid/validator-gogo-proto v0.4.0 + github.com/katydid/parser-go-json v0.1.0 + github.com/katydid/parser-go-xml v0.1.0 + github.com/katydid/parser-gogo-proto v0.2.0 + github.com/katydid/validator-go v0.5.1 ) + +require github.com/katydid/parser-go v0.6.0 // indirect diff --git a/go.sum b/go.sum index 9a21213..67e0f54 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,15 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/katydid/validator-go v0.4.0 h1:7rEZy9bYzmT0FG5RaCV2Eextn+C3+Bnh6mAvof82yFg= -github.com/katydid/validator-go v0.4.0/go.mod h1:4kIOmsQyfSJMtELzYrfMPlyIar1HpHgYBUefJNIHl+Y= -github.com/katydid/validator-gogo-proto v0.4.0 h1:5/xgFDbSl4iNLO/8U3qkgSFGWYHUMtQnXurI/dC3eos= -github.com/katydid/validator-gogo-proto v0.4.0/go.mod h1:VeLiECcVV7ol40oYcwNqKXsOmUaSuwrCdm+adFHEQlA= +github.com/katydid/parser-go v0.6.0 h1:8VFYXEp9pZsq4CCxYLDavPPqOSX+JXsmhjfU4XMB8iw= +github.com/katydid/parser-go v0.6.0/go.mod h1:1BwRfDlyRgDlAaURZ4FXi7IzHqWKTsrCdsstLsFeQho= +github.com/katydid/parser-go-json v0.1.0 h1:r3+YkDtf9A4JYO+MrdQsN2azxITrgO+2Sc5SSNhp+YI= +github.com/katydid/parser-go-json v0.1.0/go.mod h1:iLjxtkGLdPROUPBHZAhOTIdQerUPl/FEplS10rlq9Nc= +github.com/katydid/parser-go-xml v0.1.0 h1:8AL0X9hQbNLbQeqRbOdKBOwx4WTSWjy7kxEMmWqHMXc= +github.com/katydid/parser-go-xml v0.1.0/go.mod h1:7rEHS3YuEv/8/ep+uQnLgcvT1znZs8JEc3ZaBbpygjA= +github.com/katydid/parser-gogo-proto v0.2.0 h1:zUpdli98aYSQY1mvzbysNkk/41jPB25W4NiRXocI/Kg= +github.com/katydid/parser-gogo-proto v0.2.0/go.mod h1:AH9y+kby4gN4o8w3MHDn6EX4SjrviWycnFjvEr/o1Ho= +github.com/katydid/validator-go v0.5.1 h1:XgLkSO62OFjcS7hmN8RTj0gHpMBdYRTAkiVtM59SV7E= +github.com/katydid/validator-go v0.5.1/go.mod h1:ZVsNg5NEwcOJT2ukTrCu/jKKuNiTRS/4sw4cMNr9vh8= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/install_protoc.sh b/install_protoc.sh index c1b5945..c5cd1c4 100755 --- a/install_protoc.sh +++ b/install_protoc.sh @@ -4,6 +4,6 @@ set -ex cd ${HOME} -basename=protoc-3.14.0-linux-x86_64 -wget https://github.com/google/protobuf/releases/download/v3.14.0/$basename.zip +basename=protoc-29.3-linux-x86_64 +wget https://github.com/protocolbuffers/protobuf/releases/download/v29.3/$basename.zip unzip $basename.zip \ No newline at end of file diff --git a/validator/gen-validator-tests/bench.go b/validator/gen-validator-tests/bench.go index ce00748..2a009f5 100644 --- a/validator/gen-validator-tests/bench.go +++ b/validator/gen-validator-tests/bench.go @@ -22,12 +22,12 @@ import ( "github.com/gogo/protobuf/proto" - jsonparser "github.com/katydid/validator-go/parser/json" - xmlparser "github.com/katydid/validator-go/parser/xml" + jsonparser "github.com/katydid/parser-go-json/json" + xmlparser "github.com/katydid/parser-go-xml/xml" + protoparser "github.com/katydid/parser-gogo-proto/proto" "github.com/katydid/validator-go/validator" "github.com/katydid/validator-go/validator/ast" "github.com/katydid/validator-go/validator/combinator" - protoparser "github.com/katydid/validator-gogo-proto/parser/proto" ) type BenchValidator struct { diff --git a/validator/tests/pb/BananaLargeMatch/valid.main.BananaTuple.desc.pb b/validator/tests/pb/BananaLargeMatch/valid.main.BananaTuple.desc.pb index 3f35d00cfc0dc7811c90eced91e4261f5f504257..78918c3626ad4594ba84a982c81ca14929dcf39a 100644 GIT binary patch literal 197 zcmdqv-OAHQAH3<(2Gbr_S zPOZu|H_7rTOe`#LjWBmKHVR2IHupBJbasp^uypn?EY2u5Fe~?zU{q2rw@7v>bk52R z%8T^LP0mktbj)$f^h-1ktSU-32}#Y!N;TAAFp|mh$#lyyGja_z3bBkx3N()hEvibg xD98wQG6=L_aAGzwGV)*yVlps_U`$xQlPQC-;CM;}V*?{|2P4A-Mu8cO3;^qDKTH4s literal 152 zcmd<+>%YBm`t`NTyBLK`^1Q;zGO{wNQYsC~6MZ8>ozhB*i!72;9rGLu3X@a(jM5`a zf-{m!Q!<=P4O1hte1a{FB^Z=gqg>pbqcj+eRLY9|i;@e%lF9?Ki;I1IN}b)qjJ%5c zN)iK#eezsV9V_xIt1K9um`#j~JQ#zR42&We6V~r!%3vrso>IZkz{uFa$T)$KWd