Skip to content

Commit

Permalink
Update all dependencies and use Go 1.14 (#395)
Browse files Browse the repository at this point in the history
Part of #362. I wish to do
#384 before blessing the next
release of the ooniprobe engine, though.

While there, also update to go 1.14 both for go.mod and for CI.
  • Loading branch information
bassosimone committed Mar 9, 2020
1 parent e5272b1 commit 94647f1
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
fail-fast: false
matrix:
os: [macos-latest]
go: ["1.13"]
go: ["1.14"]
steps:
- uses: actions/setup-go@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
go: ["1.13"]
go: ["1.14"]
steps:
- uses: actions/setup-go@v1
with:
Expand Down
11 changes: 4 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/ooni/probe-engine

go 1.13
go 1.14

require (
git.torproject.org/pluggable-transports/goptlib.git v1.1.0
Expand All @@ -12,11 +12,11 @@ require (
github.com/Psiphon-Labs/goarista v0.0.0-20160825065156-d002785f4c67 // indirect
github.com/Psiphon-Labs/goptlib v0.0.0-20180426172440-18963be5f9c5 // indirect
github.com/Psiphon-Labs/net v0.0.0-20191204183604-f5d60dada742 // indirect
github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.11-0.20200220203753-39322c546da8+incompatible
github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.11-0.20200225001008-1602125eff13+incompatible
github.com/Psiphon-Labs/quic-go v0.14.1-0.20200128193928-738e15bfe6c3 // indirect
github.com/Psiphon-Labs/tls-tris v0.0.0-20191206190901-78f52e6d6243 // indirect
github.com/apex/log v1.1.2
github.com/aristanetworks/goarista v0.0.0-20200214154357-2151774b0d85 // indirect
github.com/aristanetworks/goarista v0.0.0-20200306225906-e0480e715858 // indirect
github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f // indirect
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect
github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61 // indirect
Expand All @@ -29,7 +29,6 @@ require (
github.com/dustin/go-humanize v1.0.0
github.com/elazarl/goproxy v0.0.0-20171101143503-a96fa3a31826 // indirect
github.com/gobwas/glob v0.2.4-0.20180402141543-f00a7392b439 // indirect
github.com/google/go-cmp v0.4.0 // indirect
github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4 // indirect
github.com/grafov/m3u8 v0.0.0-20171211212457-6ab8f28ed427 // indirect
github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334
Expand All @@ -56,7 +55,5 @@ require (
go.uber.org/atomic v1.3.3-0.20180806045314-ca680462431f // indirect
go.uber.org/multierr v1.1.1-0.20180122172545-ddea229ff1df // indirect
go.uber.org/zap v1.9.2-0.20180814183419-67bc79d13d15 // indirect
golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6 // indirect
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c // indirect
golang.org/x/net v0.0.0-20200301022130-244492dfa37a
)
Loading

0 comments on commit 94647f1

Please sign in to comment.