Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make YAML 3 the default #1357

Merged
merged 2 commits into from May 26, 2022
Merged

Make YAML 3 the default #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46439fd
chore(deps): update yaml3
sagikazarmark May 26, 2022
24cbd98
feat: make yaml3 the default
sagikazarmark May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
go: ['1.15', '1.16', '1.17', '1.18']
tags: ['', 'viper_yaml3', 'viper_toml2']
tags: ['', 'viper_yaml2', 'viper_toml2']
env:
GOFLAGS: -mod=readonly

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ require (
github.com/subosito/gotenv v1.3.0
gopkg.in/ini.v1 v1.66.4
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
gopkg.in/yaml.v3 v3.0.0
)

require (
Expand Down
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Expand Up @@ -902,8 +902,9 @@ gopkg.in/yaml.v2 v2.3.0/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=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
Expand Down
4 changes: 2 additions & 2 deletions internal/encoding/yaml/yaml2.go
View file
Open in desktop
@@ -1,5 +1,5 @@
//go:build !viper_yaml3
// +build !viper_yaml3
//go:build viper_yaml2
// +build viper_yaml2

package yaml

Expand Down
4 changes: 2 additions & 2 deletions internal/encoding/yaml/yaml2_test.go
View file
Open in desktop
@@ -1,5 +1,5 @@
//go:build !viper_yaml3
// +build !viper_yaml3
//go:build viper_yaml2
// +build viper_yaml2

package yaml

Expand Down
4 changes: 2 additions & 2 deletions internal/encoding/yaml/yaml3.go
View file
Open in desktop
@@ -1,5 +1,5 @@
//go:build viper_yaml3
// +build viper_yaml3
//go:build !viper_yaml2
// +build !viper_yaml2

package yaml

Expand Down
4 changes: 2 additions & 2 deletions internal/encoding/yaml/yaml3_test.go
View file
Open in desktop
@@ -1,5 +1,5 @@
//go:build viper_yaml3
// +build viper_yaml3
//go:build !viper_yaml2
// +build !viper_yaml2

package yaml

Expand Down
4 changes: 2 additions & 2 deletions viper_yaml2_test.go
View file
Open in desktop
@@ -1,5 +1,5 @@
//go:build !viper_yaml3
// +build !viper_yaml3
//go:build viper_yaml2
// +build viper_yaml2

package viper

Expand Down
4 changes: 2 additions & 2 deletions viper_yaml3_test.go
View file
Open in desktop
@@ -1,5 +1,5 @@
//go:build viper_yaml3
// +build viper_yaml3
//go:build !viper_yaml2
// +build !viper_yaml2

package viper

Expand Down