Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go.mod: update github.com/golang/snappy for encode_arm64 fix #21785

Closed
wants to merge 3 commits into from

Conversation

ucwong
Copy link
Contributor

@ucwong ucwong commented Nov 4, 2020

@holiman
Copy link
Contributor

holiman commented Nov 4, 2020

Good catch, thanks for notifying us about it!

@karalabe
Copy link
Member

karalabe commented Nov 4, 2020

This fix will only be needed for Go 1.16, should we merge it now, given that it had 13 hours of existence to back it?

Edit: My vote is to leave the PR pending for a few weeks and if th snappy repo does not push any more updates in the mean time, maybe then click the button.

@karalabe karalabe added this to the 1.9.25 milestone Nov 4, 2020
@fjl fjl changed the title snappy encode_arm64 bug fix go.mod: update github.com/golang/snappy for encode_arm64 fix Dec 1, 2020
@holiman
Copy link
Contributor

holiman commented Dec 1, 2020

Minimal change:

diff --git a/go.mod b/go.mod
index 9a35f6447f..0f47809ef6 100644
--- a/go.mod
+++ b/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect
 	github.com/go-stack/stack v1.8.0
 	github.com/golang/protobuf v1.4.2
-	github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26
+	github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3
 	github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa
 	github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989
 	github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277
diff --git a/go.sum b/go.sum
index dedae7bc7a..2c5b164d95 100644
--- a/go.sum
+++ b/go.sum
@@ -97,6 +97,10 @@ github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26 h1:lMm2hD9Fy0ynom5+85/pbdkiYcBqM1JWmhpAXLmy0fw=
 github.com/golang/snappy v0.0.2-0.20200707131729-196ae77b8a26/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw=
+github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 h1:ur2rms48b3Ep1dxh7aUV2FZEQ8jEVO2F6ILKx8ofkAg=
+github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=

@fjl
Copy link
Contributor

fjl commented Dec 2, 2020

@ucwong I merged #21934 instead because
it didn't mess with go.mod so much. Thanks again for the reminder to update this library.

@fjl fjl closed this Dec 2, 2020
@fjl fjl removed the status:on-hold label Dec 9, 2020
@fjl fjl removed their assignment Dec 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants