Skip to content

Commit d5f4abf

Browse files
authored
Merge pull request #397 from Jigsaw-Code/update-yaml
chore(x) switch yaml lib from yaml.v3 to go-yaml
2 parents 9d799fe + 564547d commit d5f4abf

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

x/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
// Use github.com/Psiphon-Labs/psiphon-tunnel-core@staging-client as per
88
// https://github.com/Psiphon-Labs/psiphon-tunnel-core/?tab=readme-ov-file#using-psiphon-with-go-modules
99
github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250319154633-ceb78316d06e
10+
github.com/goccy/go-yaml v1.16.0
1011
github.com/gorilla/websocket v1.5.3
1112
github.com/lmittmann/tint v1.0.5
1213
github.com/quic-go/quic-go v0.48.1
@@ -17,7 +18,6 @@ require (
1718
golang.org/x/net v0.36.0
1819
golang.org/x/sys v0.30.0
1920
golang.org/x/term v0.29.0
20-
gopkg.in/yaml.v3 v3.0.1
2121
)
2222

2323
require (
@@ -119,5 +119,6 @@ require (
119119
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect
120120
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
121121
google.golang.org/protobuf v1.33.0 // indirect
122+
gopkg.in/yaml.v3 v3.0.1 // indirect
122123
tailscale.com v1.58.2 // indirect
123124
)

x/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEe
100100
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
101101
github.com/gobwas/glob v0.2.4-0.20180402141543-f00a7392b439 h1:T6zlOdzrYuHf6HUKujm9bzkzbZ5Iv/xf6rs8BHZDpoI=
102102
github.com/gobwas/glob v0.2.4-0.20180402141543-f00a7392b439/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
103+
github.com/goccy/go-yaml v1.16.0 h1:d7m1G7A0t+logajVtklHfDYJs2Et9g3gHwdBNNFou0w=
104+
github.com/goccy/go-yaml v1.16.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
103105
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
104106
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
105107
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=

x/smart/stream_dialer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"sync"
2626
"time"
2727

28+
"github.com/goccy/go-yaml"
2829
"github.com/Jigsaw-Code/outline-sdk/dns"
2930
"github.com/Jigsaw-Code/outline-sdk/transport"
3031
"github.com/Jigsaw-Code/outline-sdk/x/configurl"
31-
"gopkg.in/yaml.v3"
3232
)
3333

3434
// To test one strategy:

0 commit comments

Comments
 (0)