From 4322cf20e9c78981da0210366d2697f5cbf2df4e Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Thu, 26 May 2022 17:30:14 +0200 Subject: [PATCH] feat: make toml2 the default Signed-off-by: Mark Sagi-Kazar --- .github/workflows/ci.yaml | 2 +- internal/encoding/toml/codec.go | 4 ++-- internal/encoding/toml/codec2.go | 4 ++-- internal/encoding/toml/codec2_test.go | 4 ++-- internal/encoding/toml/codec_test.go | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 152c10662..a416b39a0 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_yaml2', 'viper_toml2'] + tags: ['', 'viper_yaml2', 'viper_toml1'] env: GOFLAGS: -mod=readonly diff --git a/internal/encoding/toml/codec.go b/internal/encoding/toml/codec.go index ff1112cac..45fddc8b5 100644 --- a/internal/encoding/toml/codec.go +++ b/internal/encoding/toml/codec.go @@ -1,5 +1,5 @@ -//go:build !viper_toml2 -// +build !viper_toml2 +//go:build viper_toml1 +// +build viper_toml1 package toml diff --git a/internal/encoding/toml/codec2.go b/internal/encoding/toml/codec2.go index 566b70628..112c6d372 100644 --- a/internal/encoding/toml/codec2.go +++ b/internal/encoding/toml/codec2.go @@ -1,5 +1,5 @@ -//go:build viper_toml2 -// +build viper_toml2 +//go:build !viper_toml1 +// +build !viper_toml1 package toml diff --git a/internal/encoding/toml/codec2_test.go b/internal/encoding/toml/codec2_test.go index 271e32171..c9dac6211 100644 --- a/internal/encoding/toml/codec2_test.go +++ b/internal/encoding/toml/codec2_test.go @@ -1,5 +1,5 @@ -//go:build viper_toml2 -// +build viper_toml2 +//go:build !viper_toml1 +// +build !viper_toml1 package toml diff --git a/internal/encoding/toml/codec_test.go b/internal/encoding/toml/codec_test.go index c7a2756d9..4f265bed5 100644 --- a/internal/encoding/toml/codec_test.go +++ b/internal/encoding/toml/codec_test.go @@ -1,5 +1,5 @@ -//go:build !viper_toml2 -// +build !viper_toml2 +//go:build viper_toml1 +// +build viper_toml1 package toml