feat: make yaml3 the default

Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
spf13 · May 26, 2022 · 8d02999 · 8d02999
1 parent 7c35aa9
commit 8d02999
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
-//go:build viper_yaml3
-// +build viper_yaml3
+//go:build !viper_yaml2
+// +build !viper_yaml2
 
 package viper