From 14e91c852c4da694fcb15de2b164447e9b11cb81 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Thu, 26 May 2022 17:10:16 +0200 Subject: [PATCH] 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 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6314980a8d..152c106627 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 ca29b84dbf..4c398c2f42 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 e39d4298d4..8b4fdd2f67 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 96b8957fa3..3a4775ced9 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 6beb263c89..e6a86c255f 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