chore: upgrade most deps except snowflake #1346
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This diff upgrades most deps except for snowflake and related dependencies such as goptlib. It also seems that we can't upgrade snowflake without also replacing obfs4 with lyrebird. The following diff contains the packages I *did not* update: ```diff diff --git a/go.mod b/go.mod index 09b51d97..54eecd98 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/rubenv/sql-migrate v1.5.2 github.com/schollz/progressbar/v3 v3.13.1 github.com/upper/db/v4 v4.6.0 - gitlab.com/yawning/obfs4.git v0.0.0-20230519154740-645026c2ada4 + gitlab.com/yawning/obfs4.git v0.0.0-20231005123604-19f5a37fe427 gitlab.com/yawning/utls.git v0.0.12-1 golang.org/x/crypto v0.13.0 golang.org/x/net v0.15.0 @@ -74,13 +74,14 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/xhit/go-str2duration/v2 v2.1.0 // indirect + gitlab.com/yawning/edwards25519-extra v0.0.0-20231005122941-2149dcafc266 // indirect gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0 // indirect go.uber.org/mock v0.3.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/exp/typeparams v0.0.0-20230522175609-2e198f4a06a1 // indirect golang.org/x/time v0.3.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33 // indirect + gvisor.dev/gvisor v0.0.0-20231005075148-09be6cec5e98 // indirect ) require ( @@ -89,7 +90,7 @@ require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61 // indirect + github.com/bifurcation/mint v0.0.0-20210616192047-fd18df995463 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cheekybits/genny v1.0.0 // indirect github.com/cognusion/go-cache-lru v0.0.0-20170419142635-f73e2280ecea // indirect @@ -132,7 +133,7 @@ require ( github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/refraction-networking/gotapdance v1.7.4 // indirect - github.com/refraction-networking/utls v1.3.3 // indirect + github.com/refraction-networking/utls v1.5.3 // indirect github.com/sergeyfrolov/bsbuffer v0.0.0-20180903213811-94e85abb8507 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.7.0 @@ -142,11 +143,11 @@ require ( github.com/templexxx/xorsimd v0.4.2 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78 // indirect - github.com/xtaci/kcp-go/v5 v5.6.2 // indirect + github.com/xtaci/kcp-go/v5 v5.6.3 // indirect github.com/xtaci/smux v1.5.24 // indirect gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect gitlab.com/yawning/edwards25519-extra.git v0.0.0-20230925102617-375edaeb7d45 // indirect - golang.org/x/mod v0.12.0 // indirect + golang.org/x/mod v0.13.0 // indirect golang.org/x/term v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.13.0 // indirect ``` The following updates would break the build: - gvisor because the default branch is not go.mod ready; - kcp-go because v5.6.3 requires go1.21; - obfs4 because it requires changing goptlib, which I'll do next; - mint because Psiphon requires that version of mint. Part of ooni/probe#2524
26 tasks
Murphy-OrangeMud
pushed a commit
to Murphy-OrangeMud/probe-cli
that referenced
this pull request
Feb 13, 2024
This diff upgrades most deps except for snowflake and related dependencies such as goptlib. The following diff contains the packages I *did not* update: ```diff diff --git a/go.mod b/go.mod index 09b51d97..54eecd98 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/rubenv/sql-migrate v1.5.2 github.com/schollz/progressbar/v3 v3.13.1 github.com/upper/db/v4 v4.6.0 - gitlab.com/yawning/obfs4.git v0.0.0-20230519154740-645026c2ada4 + gitlab.com/yawning/obfs4.git v0.0.0-20231005123604-19f5a37fe427 gitlab.com/yawning/utls.git v0.0.12-1 golang.org/x/crypto v0.13.0 golang.org/x/net v0.15.0 @@ -74,13 +74,14 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.8.4 // indirect github.com/xhit/go-str2duration/v2 v2.1.0 // indirect + gitlab.com/yawning/edwards25519-extra v0.0.0-20231005122941-2149dcafc266 // indirect gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0 // indirect go.uber.org/mock v0.3.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/exp/typeparams v0.0.0-20230522175609-2e198f4a06a1 // indirect golang.org/x/time v0.3.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gvisor.dev/gvisor v0.0.0-20230603040744-5c9219dedd33 // indirect + gvisor.dev/gvisor v0.0.0-20231005075148-09be6cec5e98 // indirect ) require ( @@ -89,7 +90,7 @@ require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61 // indirect + github.com/bifurcation/mint v0.0.0-20210616192047-fd18df995463 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cheekybits/genny v1.0.0 // indirect github.com/cognusion/go-cache-lru v0.0.0-20170419142635-f73e2280ecea // indirect @@ -132,7 +133,7 @@ require ( github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/refraction-networking/gotapdance v1.7.4 // indirect - github.com/refraction-networking/utls v1.3.3 // indirect + github.com/refraction-networking/utls v1.5.3 // indirect github.com/sergeyfrolov/bsbuffer v0.0.0-20180903213811-94e85abb8507 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cobra v1.7.0 @@ -142,11 +143,11 @@ require ( github.com/templexxx/xorsimd v0.4.2 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78 // indirect - github.com/xtaci/kcp-go/v5 v5.6.2 // indirect + github.com/xtaci/kcp-go/v5 v5.6.3 // indirect github.com/xtaci/smux v1.5.24 // indirect gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect gitlab.com/yawning/edwards25519-extra.git v0.0.0-20230925102617-375edaeb7d45 // indirect - golang.org/x/mod v0.12.0 // indirect + golang.org/x/mod v0.13.0 // indirect golang.org/x/term v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.13.0 // indirect ``` The following updates would break the build: - gvisor because the default branch is not go.mod ready; - kcp-go because v5.6.3 requires go1.21; - obfs4 because it requires changing goptlib, which I'll do next; - mint because Psiphon requires that version of mint. This work is part of ooni/probe#2524
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This diff upgrades most deps except for snowflake and related dependencies such as goptlib.
The following diff contains the packages I did not update:
The following updates would break the build:
gvisor because the default branch is not go.mod ready;
kcp-go because v5.6.3 requires go1.21;
obfs4 because it requires changing goptlib, which I'll do next;
mint because Psiphon requires that version of mint.
This work is part of ooni/probe#2524