Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yq for openSUSE:Factory checked in
at 2022-12-18 19:11:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yq (Old)
and /work/SRC/openSUSE:Factory/.yq.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yq"
Sun Dec 18 19:11:47 2022 rev:4 rq:1043633 version:4.30.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/yq/yq.changes 2022-12-13 18:55:55.379349178
+0100
+++ /work/SRC/openSUSE:Factory/.yq.new.1835/yq.changes 2022-12-18
19:11:48.553987842 +0100
@@ -1,0 +2,15 @@
+Sun Dec 18 13:43:18 UTC 2022 - dmuel...@suse.com
+
+- Update to version 4.30.6:
+ * Bumping version
+ * release notes
+ * Fixed xml comment in array of scalars #1465
+ * Bump github.com/magiconair/properties from 1.8.6 to 1.8.7 (#1476)
+ * Bump github.com/goccy/go-yaml from 1.9.6 to 1.9.7 (#1466)
+ * Bump golang from 1.19.3 to 1.19.4 (#1465)
+ * Include blank new lines in leading header preprocessing #1462
+ * Upgraded golang/x/text and golang/x/net to fix trivy scan vulnerabilities
(#1461)
+ * Bump github.com/goccy/go-json from 0.9.11 to 0.10.0 (#1455)
+ * updating release notes
+
+-------------------------------------------------------------------
Old:
----
yq-4.30.5.tar.gz
New:
----
yq-4.30.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yq.spec ++++++
--- /var/tmp/diff_new_pack.A5E8qG/_old 2022-12-18 19:11:49.277991977 +0100
+++ /var/tmp/diff_new_pack.A5E8qG/_new 2022-12-18 19:11:49.281991999 +0100
@@ -20,7 +20,7 @@
%global import_path %{provider_prefix}
Name: yq
-Version: 4.30.5
+Version: 4.30.6
Release: 0
Summary: A portable command-line YAML processor
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.A5E8qG/_old 2022-12-18 19:11:49.317992205 +0100
+++ /var/tmp/diff_new_pack.A5E8qG/_new 2022-12-18 19:11:49.321992229 +0100
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
- <param name="revision">v4.30.5</param>
+ <param name="revision">v4.30.6</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.A5E8qG/_old 2022-12-18 19:11:49.341992342 +0100
+++ /var/tmp/diff_new_pack.A5E8qG/_new 2022-12-18 19:11:49.345992365 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/mikefarah/yq.git</param>
- <param
name="changesrevision">42e7c3cdf08ccd664875d7ac685c7414b61962be</param></service></servicedata>
+ <param
name="changesrevision">87cba2ecbeaecf860efcceb66deab46ae030ce1e</param></service></servicedata>
(No newline at EOF)
++++++ vendor.tar.gz ++++++
++++ 4953 lines of diff (skipped)
++++++ yq-4.30.5.tar.gz -> yq-4.30.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/Dockerfile new/yq-4.30.6/Dockerfile
--- old/yq-4.30.5/Dockerfile 2022-11-27 22:36:05.000000000 +0100
+++ new/yq-4.30.6/Dockerfile 2022-12-17 01:16:38.000000000 +0100
@@ -1,4 +1,4 @@
-FROM golang:1.19.3 as builder
+FROM golang:1.19.4 as builder
WORKDIR /go/src/mikefarah/yq
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/Dockerfile.dev new/yq-4.30.6/Dockerfile.dev
--- old/yq-4.30.5/Dockerfile.dev 2022-11-27 22:36:05.000000000 +0100
+++ new/yq-4.30.6/Dockerfile.dev 2022-12-17 01:16:38.000000000 +0100
@@ -1,4 +1,4 @@
-FROM golang:1.19.3
+FROM golang:1.19.4
COPY scripts/devtools.sh /opt/devtools.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/acceptance_tests/leading-seperator.sh
new/yq-4.30.6/acceptance_tests/leading-seperator.sh
--- old/yq-4.30.5/acceptance_tests/leading-seperator.sh 2022-11-27
22:36:05.000000000 +0100
+++ new/yq-4.30.6/acceptance_tests/leading-seperator.sh 2022-12-17
01:16:38.000000000 +0100
@@ -34,6 +34,64 @@
assertEquals "$expected" "$X"
}
+
+testLeadingSeperatorWithNewlinesNewDoc() {
+ cat >test.yml <<EOL
+# hi peeps
+# cool
+
+
+---
+a: test
+---
+b: cool
+EOL
+
+ read -r -d '' expected << EOM
+# hi peeps
+# cool
+
+
+---
+a: thing
+---
+b: cool
+EOM
+
+ X=$(./yq e '(select(di == 0) | .a) = "thing"' - < test.yml)
+ assertEquals "$expected" "$X"
+}
+
+testLeadingSeperatorWithNewlinesMoreComments() {
+ cat >test.yml <<EOL
+# hi peeps
+# cool
+
+---
+# great
+
+a: test
+---
+b: cool
+EOL
+
+ read -r -d '' expected << EOM
+# hi peeps
+# cool
+
+---
+# great
+
+a: thing
+---
+b: cool
+EOM
+
+ X=$(./yq e '(select(di == 0) | .a) = "thing"' - < test.yml)
+ assertEquals "$expected" "$X"
+}
+
+
testLeadingSeperatorWithDirective() {
cat >test.yml <<EOL
%YAML 1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/cmd/version.go new/yq-4.30.6/cmd/version.go
--- old/yq-4.30.5/cmd/version.go 2022-11-27 22:36:05.000000000 +0100
+++ new/yq-4.30.6/cmd/version.go 2022-12-17 01:16:38.000000000 +0100
@@ -11,7 +11,7 @@
GitDescribe string
// Version is main version number that is being run at the moment.
- Version = "v4.30.5"
+ Version = "v4.30.6"
// VersionPrerelease is a pre-release marker for the version. If this
is "" (empty string)
// then it means that it is a final release. Otherwise, this is a
pre-release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/go.mod new/yq-4.30.6/go.mod
--- old/yq-4.30.5/go.mod 2022-11-27 22:36:05.000000000 +0100
+++ new/yq-4.30.6/go.mod 2022-12-17 01:16:38.000000000 +0100
@@ -7,14 +7,14 @@
github.com/dimchansky/utfbom v1.1.1
github.com/elliotchance/orderedmap v1.5.0
github.com/fatih/color v1.13.0
- github.com/goccy/go-json v0.9.11
- github.com/goccy/go-yaml v1.9.6
+ github.com/goccy/go-json v0.10.0
+ github.com/goccy/go-yaml v1.9.7
github.com/jinzhu/copier v0.3.5
- github.com/magiconair/properties v1.8.6
+ github.com/magiconair/properties v1.8.7
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
- golang.org/x/net v0.0.0-20220708220712-1185a9018129
+ golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
gopkg.in/yaml.v3 v3.0.1
)
@@ -23,8 +23,8 @@
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
- golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
- golang.org/x/text v0.3.7 // indirect
+ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
+ golang.org/x/text v0.3.8 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/go.sum new/yq-4.30.6/go.sum
--- old/yq-4.30.5/go.sum 2022-11-27 22:36:05.000000000 +0100
+++ new/yq-4.30.6/go.sum 2022-12-17 01:16:38.000000000 +0100
@@ -19,18 +19,18 @@
github.com/go-playground/locales v0.13.0/go.mod
h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
github.com/go-playground/universal-translator v0.17.0/go.mod
h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
github.com/go-playground/validator/v10 v10.4.1/go.mod
h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/goccy/go-json v0.9.11
h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
-github.com/goccy/go-json v0.9.11/go.mod
h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-yaml v1.9.6 h1:KhAu1zf9JXnm3vbG49aDE0E5uEBUsM4uwD31/58ZWyI=
-github.com/goccy/go-yaml v1.9.6/go.mod
h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXKkTfoE=
+github.com/goccy/go-json v0.10.0
h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
+github.com/goccy/go-json v0.10.0/go.mod
h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-yaml v1.9.7 h1:D/Vx+JITklB1ugSkncB4BNR67M3X6AKs9+rqVeo3ddw=
+github.com/goccy/go-yaml v1.9.7/go.mod
h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXKkTfoE=
github.com/hexops/gotextdiff v1.0.3
h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
github.com/inconshreveable/mousetrap v1.0.1
h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
github.com/inconshreveable/mousetrap v1.0.1/go.mod
h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
github.com/jinzhu/copier v0.3.5/go.mod
h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
github.com/leodido/go-urn v1.2.0/go.mod
h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/magiconair/properties v1.8.6
h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
-github.com/magiconair/properties v1.8.6/go.mod
h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/magiconair/properties v1.8.7
h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
+github.com/magiconair/properties v1.8.7/go.mod
h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
github.com/mattn/go-colorable v0.1.8/go.mod
h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-colorable v0.1.9/go.mod
h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-colorable v0.1.12
h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
@@ -54,8 +54,8 @@
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod
h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod
h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod
h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20220708220712-1185a9018129
h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0=
-golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod
h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
+golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod
h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -63,12 +63,12 @@
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e
h1:NHvCuwuS43lGnYhten69ZWqi2QOj/CiDNcKbVqwVoew=
-golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10
h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod
h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f
h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/pkg/yqlib/decoder_xml.go
new/yq-4.30.6/pkg/yqlib/decoder_xml.go
--- old/yq-4.30.5/pkg/yqlib/decoder_xml.go 2022-11-27 22:36:05.000000000
+0100
+++ new/yq-4.30.6/pkg/yqlib/decoder_xml.go 2022-12-17 01:16:38.000000000
+0100
@@ -58,7 +58,7 @@
yamlNode := &yaml.Node{Kind: yaml.MappingNode, Tag: "!!map"}
if len(n.Data) > 0 {
- log.Debug("creating content node for map")
+ log.Debugf("creating content node for map: %v",
dec.prefs.ContentName)
label := dec.prefs.ContentName
labelNode := createScalarNode(label, label)
labelNode.HeadComment = dec.processComment(n.HeadComment)
@@ -78,7 +78,7 @@
labelNode.HeadComment =
dec.processComment(n.HeadComment)
}
-
+ log.Debugf("label=%v, i=%v, keyValuePair.FootComment: %v",
label, i, keyValuePair.FootComment)
labelNode.FootComment =
dec.processComment(keyValuePair.FootComment)
log.Debug("len of children in %v is %v", label, len(children))
@@ -337,8 +337,14 @@
if len(elem.n.Children) > 0 {
lastChildIndex := len(elem.n.Children) - 1
childKv := elem.n.Children[lastChildIndex]
- log.Debug("got a foot comment for %v: [%v]", childKv.K,
commentStr)
- childKv.FootComment = joinComments([]string{elem.n.FootComment,
commentStr}, " ")
+ log.Debug("got a foot comment, putting on last child for %v:
[%v]", childKv.K, commentStr)
+ // if it's an array of scalars, put the foot comment on the
scalar itself
+ if len(childKv.V) > 0 && len(childKv.V[0].Children) == 0 {
+ nodeToUpdate := childKv.V[len(childKv.V)-1]
+ nodeToUpdate.FootComment =
joinComments([]string{nodeToUpdate.FootComment, commentStr}, " ")
+ } else {
+ childKv.FootComment =
joinComments([]string{elem.n.FootComment, commentStr}, " ")
+ }
} else {
log.Debug("got a foot comment for %v: [%v]", elem.label,
commentStr)
elem.n.FootComment = joinComments([]string{elem.n.FootComment,
commentStr}, " ")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/pkg/yqlib/decoder_yaml.go
new/yq-4.30.6/pkg/yqlib/decoder_yaml.go
--- old/yq-4.30.5/pkg/yqlib/decoder_yaml.go 2022-11-27 22:36:05.000000000
+0100
+++ new/yq-4.30.6/pkg/yqlib/decoder_yaml.go 2022-12-17 01:16:38.000000000
+0100
@@ -39,6 +39,14 @@
return reader, sb.String(), nil
} else if err != nil {
return reader, sb.String(), err
+ } else if string(peekBytes[0]) == "\n" {
+ _, err := reader.ReadString('\n')
+ sb.WriteString("\n")
+ if errors.Is(err, io.EOF) {
+ return reader, sb.String(), nil
+ } else if err != nil {
+ return reader, sb.String(), err
+ }
} else if string(peekBytes) == "---" {
_, err := reader.ReadString('\n')
sb.WriteString("$yqDocSeperator$\n")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yq-4.30.5/pkg/yqlib/doc/operators/comment-operators.md
new/yq-4.30.6/pkg/yqlib/doc/operators/comment-operators.md
--- old/yq-4.30.5/pkg/yqlib/doc/operators/comment-operators.md 2022-11-27
22:36:05.000000000 +0100
+++ new/yq-4.30.6/pkg/yqlib/doc/operators/comment-operators.md 2022-12-17
01:16:38.000000000 +0100
@@ -247,6 +247,7 @@
Given a sample.yml file of:
```yaml
# hi
+
a: cat # comment
# great
b: # key comment
@@ -265,6 +266,7 @@
Given a sample.yml file of:
```yaml
# welcome!
+
a: cat # meow
# have a great day
```
@@ -293,6 +295,7 @@
will output
```yaml
welcome!
+
```
## Head comment with document split
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/pkg/yqlib/doc/operators/path.md
new/yq-4.30.6/pkg/yqlib/doc/operators/path.md
--- old/yq-4.30.5/pkg/yqlib/doc/operators/path.md 2022-11-27
22:36:05.000000000 +0100
+++ new/yq-4.30.6/pkg/yqlib/doc/operators/path.md 2022-12-17
01:16:38.000000000 +0100
@@ -127,6 +127,7 @@
Given a sample.yml file of:
```yaml
+
parentA: bob
parentB:
child1: i am child1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/pkg/yqlib/operator_anchors_aliases_test.go
new/yq-4.30.6/pkg/yqlib/operator_anchors_aliases_test.go
--- old/yq-4.30.5/pkg/yqlib/operator_anchors_aliases_test.go 2022-11-27
22:36:05.000000000 +0100
+++ new/yq-4.30.6/pkg/yqlib/operator_anchors_aliases_test.go 2022-12-17
01:16:38.000000000 +0100
@@ -12,8 +12,7 @@
var expectedSpecResult = "D0, P[4], (!!map)::x: 1\ny: 2\nr: 10\n"
-var simpleArrayRef = `
-item_value: &item_value
+var simpleArrayRef = `item_value: &item_value
value: true
thingOne:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/pkg/yqlib/operator_comments_test.go
new/yq-4.30.6/pkg/yqlib/operator_comments_test.go
--- old/yq-4.30.5/pkg/yqlib/operator_comments_test.go 2022-11-27
22:36:05.000000000 +0100
+++ new/yq-4.30.6/pkg/yqlib/operator_comments_test.go 2022-12-17
01:16:38.000000000 +0100
@@ -221,7 +221,7 @@
document: "# welcome!\n\na: cat # meow\n\n# have a
great day",
expression: `. | head_comment`,
expected: []string{
- "D0, P[], (!!str)::welcome!\n",
+ "D0, P[], (!!str)::welcome!\n\n",
},
},
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/pkg/yqlib/operator_multiply_test.go
new/yq-4.30.6/pkg/yqlib/operator_multiply_test.go
--- old/yq-4.30.5/pkg/yqlib/operator_multiply_test.go 2022-11-27
22:36:05.000000000 +0100
+++ new/yq-4.30.6/pkg/yqlib/operator_multiply_test.go 2022-12-17
01:16:38.000000000 +0100
@@ -108,7 +108,7 @@
document2: docNoComments,
expression: `select(fi == 0) * select(fi == 1)`,
expected: []string{
- "D0, P[], (!!map)::# here\na: apple\nb: banana\n",
+ "D0, P[], (!!map)::# here\n\na: apple\nb: banana\n",
},
},
{
@@ -126,7 +126,7 @@
document2: docWithHeader,
expression: `select(fi == 0) * select(fi == 1)`,
expected: []string{
- "D0, P[], (!!map)::# here\nb: banana\na: apple\n",
+ "D0, P[], (!!map)::# here\n\nb: banana\na: apple\n",
},
},
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/pkg/yqlib/operator_traverse_path_test.go
new/yq-4.30.6/pkg/yqlib/operator_traverse_path_test.go
--- old/yq-4.30.5/pkg/yqlib/operator_traverse_path_test.go 2022-11-27
22:36:05.000000000 +0100
+++ new/yq-4.30.6/pkg/yqlib/operator_traverse_path_test.go 2022-12-17
01:16:38.000000000 +0100
@@ -4,8 +4,7 @@
"testing"
)
-var mergeDocSample = `
-foo: &foo
+var mergeDocSample = `foo: &foo
a: foo_a
thing: foo_thing
c: foo_c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/pkg/yqlib/xml_test.go
new/yq-4.30.6/pkg/yqlib/xml_test.go
--- old/yq-4.30.5/pkg/yqlib/xml_test.go 2022-11-27 22:36:05.000000000 +0100
+++ new/yq-4.30.6/pkg/yqlib/xml_test.go 2022-12-17 01:16:38.000000000 +0100
@@ -260,6 +260,11 @@
expected: "root:\n # comment\n - value\n -
anotherValue\n",
},
{
+ skipDoc: true,
+ input: "<root><cats><cat>quick</cat><cat>soft</cat><!--
kitty_comment--><cat>squishy</cat></cats></root>",
+ expected: "root:\n cats:\n cat:\n -
quick\n - soft\n # kitty_comment\n\n -
squishy\n",
+ },
+ {
description: "Parse xml: simple",
subdescription: "Notice how all the values are strings, see the
next example on how you can fix that.",
input: "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n<cat>\n <says>meow</says>\n <legs>4</legs>\n
<cute>true</cute>\n</cat>",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/release_instructions.txt
new/yq-4.30.6/release_instructions.txt
--- old/yq-4.30.5/release_instructions.txt 2022-11-27 22:36:05.000000000
+0100
+++ new/yq-4.30.6/release_instructions.txt 2022-12-17 01:16:38.000000000
+0100
@@ -1,9 +1,9 @@
- update release notes
- make sure local build passes
- run ./scripts/copy-docs.sh (and commit the changed in the yq-book branch)
-- commit version update changes
-- tag git with same version number
-- commit vX tag - this will trigger github actions
+- run ./scripts/bump-version.sh
+- git push
+- git push --tags
- use github actions to publish docker and make github release
- check github updated yq action in marketplace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/release_notes.txt
new/yq-4.30.6/release_notes.txt
--- old/yq-4.30.5/release_notes.txt 2022-11-27 22:36:05.000000000 +0100
+++ new/yq-4.30.6/release_notes.txt 2022-12-17 01:16:38.000000000 +0100
@@ -1,3 +1,9 @@
+4.30.6:
+ - Fixed xml comment in array of scalars #1465
+ - Include blank new lines in leading header preprocessing #1462
+ - Added aarch64 build (#1261)
+ - Bumped dependency versions (#1453)
+
4.30.5:
- XML Decoder: Comment parsing tweak
- XML Decoder: Fixed processing comments in empty XML #1446
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yq-4.30.5/snap/snapcraft.yaml
new/yq-4.30.6/snap/snapcraft.yaml
--- old/yq-4.30.5/snap/snapcraft.yaml 2022-11-27 22:36:05.000000000 +0100
+++ new/yq-4.30.6/snap/snapcraft.yaml 2022-12-17 01:16:38.000000000 +0100
@@ -1,5 +1,5 @@
name: yq
-version: 'v4.30.5'
+version: 'v4.30.6'
summary: A lightweight and portable command-line YAML processor
description: |
The aim of the project is to be the jq or sed of yaml files.
