Skip to content

Commit

Permalink
Merge pull request ghodss#62 from akram/use-goyaml-2.3.0
Browse files Browse the repository at this point in the history
Bump gopkg.in/yaml.v2 to v2.4.0: fixes inconsistent long lines wrapping
  • Loading branch information
k8s-ci-robot authored Sep 22, 2021
2 parents 11e43d4 + 131615f commit cea7ff5
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 9 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
.project
.settings/**

# Idea files
.idea/**
.idea/

# Emacs save files
*~

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ go 1.12

require (
github.com/davecgh/go-spew v1.1.1
gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v2 v2.4.0
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
1 change: 1 addition & 0 deletions vendor/gopkg.in/yaml.v2/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/gopkg.in/yaml.v2/apic.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/gopkg.in/yaml.v2/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion vendor/gopkg.in/yaml.v2/yaml.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# github.com/davecgh/go-spew v1.1.1
github.com/davecgh/go-spew/spew
# gopkg.in/yaml.v2 v2.2.8
# gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v2
4 changes: 4 additions & 0 deletions yaml_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,10 @@ func TestJSONToYAML(t *testing.T) {
`{"t":null}`,
"t: null\n",
nil,
},{
`{"t":"this is very long line with spaces and it must be longer than 80 so we will repeat that it must be longer that 80"}`,
"t: this is very long line with spaces and it must be longer than 80 so we will repeat\n that it must be longer that 80\n",
nil,
},
}

Expand Down

0 comments on commit cea7ff5

Please sign in to comment.