From 46439fd1fdf213257a9c4518db1a6e108b5f3d1a Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Thu, 26 May 2022 17:05:24 +0200 Subject: [PATCH 1/2] chore(deps): update yaml3 Signed-off-by: Mark Sagi-Kazar --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index adc2c315d..35ef234cd 100644 --- a/go.mod +++ b/go.mod @@ -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 ( diff --git a/go.sum b/go.sum index 991103d24..05ed8ac0c 100644 --- a/go.sum +++ b/go.sum @@ -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= From 24cbd98ba1144296bbc221eb6f5787448f13ca79 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Thu, 26 May 2022 17:10:16 +0200 Subject: [PATCH 2/2] feat: make yaml3 the default Signed-off-by: Mark Sagi-Kazar --- .github/workflows/ci.yaml | 2 +- internal/encoding/yaml/yaml2.go | 4 ++-- internal/encoding/yaml/yaml2_test.go | 4 ++-- internal/encoding/yaml/yaml3.go | 4 ++-- internal/encoding/yaml/yaml3_test.go | 4 ++-- viper_yaml2_test.go | 4 ++-- viper_yaml3_test.go | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6314980a8..152c10662 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 diff --git a/internal/encoding/yaml/yaml2.go b/internal/encoding/yaml/yaml2.go index ca29b84db..4c398c2f4 100644 --- a/internal/encoding/yaml/yaml2.go +++ b/internal/encoding/yaml/yaml2.go @@ -1,5 +1,5 @@ -//go:build !viper_yaml3 -// +build !viper_yaml3 +//go:build viper_yaml2 +// +build viper_yaml2 package yaml diff --git a/internal/encoding/yaml/yaml2_test.go b/internal/encoding/yaml/yaml2_test.go index e39d4298d..8b4fdd2f6 100644 --- a/internal/encoding/yaml/yaml2_test.go +++ b/internal/encoding/yaml/yaml2_test.go @@ -1,5 +1,5 @@ -//go:build !viper_yaml3 -// +build !viper_yaml3 +//go:build viper_yaml2 +// +build viper_yaml2 package yaml diff --git a/internal/encoding/yaml/yaml3.go b/internal/encoding/yaml/yaml3.go index 96b8957fa..3a4775ced 100644 --- a/internal/encoding/yaml/yaml3.go +++ b/internal/encoding/yaml/yaml3.go @@ -1,5 +1,5 @@ -//go:build viper_yaml3 -// +build viper_yaml3 +//go:build !viper_yaml2 +// +build !viper_yaml2 package yaml diff --git a/internal/encoding/yaml/yaml3_test.go b/internal/encoding/yaml/yaml3_test.go index 6beb263c8..e6a86c255 100644 --- a/internal/encoding/yaml/yaml3_test.go +++ b/internal/encoding/yaml/yaml3_test.go @@ -1,5 +1,5 @@ -//go:build viper_yaml3 -// +build viper_yaml3 +//go:build !viper_yaml2 +// +build !viper_yaml2 package yaml diff --git a/viper_yaml2_test.go b/viper_yaml2_test.go index 5a8a51e4b..fa12a7405 100644 --- a/viper_yaml2_test.go +++ b/viper_yaml2_test.go @@ -1,5 +1,5 @@ -//go:build !viper_yaml3 -// +build !viper_yaml3 +//go:build viper_yaml2 +// +build viper_yaml2 package viper diff --git a/viper_yaml3_test.go b/viper_yaml3_test.go index c3978653f..ba2d8d73e 100644 --- a/viper_yaml3_test.go +++ b/viper_yaml3_test.go @@ -1,5 +1,5 @@ -//go:build viper_yaml3 -// +build viper_yaml3 +//go:build !viper_yaml2 +// +build !viper_yaml2 package viper