This is an automated email from the ASF dual-hosted git repository.
zfeng pushed a commit to branch develop-tmp
in repository https://gitbox.apache.org/repos/asf/incubator-seata-go.git
The following commit(s) were added to refs/heads/develop-tmp by this push:
new 15d50478 fix: Solve the conflict problem of introducing multiple
versions of knadh (#772)
15d50478 is described below
commit 15d504782779ddbffa1749a5153d790b42ae2a5a
Author: panlei-coder <62509266+panlei-co...@users.noreply.github.com>
AuthorDate: Sat Jun 21 18:47:52 2025 +0800
fix: Solve the conflict problem of introducing multiple versions of knadh
(#772)
* fix: Solve the conflict problem of introducing multiple versions of knadh
* fix: fix ci fail
---------
Co-authored-by: JayLiu <38887641+luky...@users.noreply.github.com>
Co-authored-by: FengZhang <zfc...@qq.com>
---
.github/workflows/golangci-lint.yml | 2 ++
go.mod | 1 -
pkg/client/config.go | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/golangci-lint.yml
b/.github/workflows/golangci-lint.yml
index e92112e2..ef6b6932 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -58,3 +58,5 @@ jobs:
version: v1.51.0
args: --timeout=10m
skip-go-installation: true
+ skip-cache: true
+ skip-pkg-cache: true
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 2a6a1f99..2f4cf340 100644
--- a/go.mod
+++ b/go.mod
@@ -39,7 +39,6 @@ require (
require (
github.com/knadh/koanf v1.5.0
- github.com/knadh/koanf/v2 v2.1.2
)
require (
diff --git a/pkg/client/config.go b/pkg/client/config.go
index 490fa17f..2e15c45b 100644
--- a/pkg/client/config.go
+++ b/pkg/client/config.go
@@ -26,11 +26,11 @@ import (
"runtime"
"strings"
+ "github.com/knadh/koanf"
"github.com/knadh/koanf/parsers/json"
"github.com/knadh/koanf/parsers/toml"
"github.com/knadh/koanf/parsers/yaml"
"github.com/knadh/koanf/providers/rawbytes"
- koanf "github.com/knadh/koanf/v2"
"seata.apache.org/seata-go/pkg/discovery"
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
