go.*: upgrade to Tailscale 1.2.2

Also revert the "0.0.0" hack that made mkversion.sh complain.

Fixes tailscale/tailscale#883

Signed-off-by: Elias Naur <mail@eliasnaur.com>
pull/4/head
Elias Naur 4 years ago
parent 3eab35ca80
commit 2b38d32130

@ -12,5 +12,5 @@ require (
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sys v0.0.0-20200812155832-6a926be9bd1d
inet.af/netaddr v0.0.0-20200810144936-56928fe48a98
tailscale.com v1.1.1-0.20201030135043-eab6e9ea4e45
tailscale.com v1.2.2
)

@ -208,5 +208,5 @@ inet.af/netaddr v0.0.0-20200810144936-56928fe48a98 h1:bWyWDZP0l6VnQ1TDKf6yNwuiED
inet.af/netaddr v0.0.0-20200810144936-56928fe48a98/go.mod h1:qqYzz/2whtrbWJvt+DNWQyvekNN4ePQZcg2xc2/Yjww=
rsc.io/goversion v1.2.0 h1:SPn+NLTiAG7w30IRK/DKp1BjvpWabYgxlLp/+kx5J8w=
rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo=
tailscale.com v1.1.1-0.20201030135043-eab6e9ea4e45 h1:7ochIqBH+55Me/eZaIubpMDxl80eoFnoSYYyDrWRhXw=
tailscale.com v1.1.1-0.20201030135043-eab6e9ea4e45/go.mod h1:JEJiCce3MHtPCTdX2ahLc4tcnxZ7b5etish1Yt0B6+w=
tailscale.com v1.2.2 h1:aTrGEGnDMKQtTEKXrkAWcZA1zDvBoOBN3IYOjEgDTV4=
tailscale.com v1.2.2/go.mod h1:JEJiCce3MHtPCTdX2ahLc4tcnxZ7b5etish1Yt0B6+w=

@ -25,7 +25,7 @@ case "$mod_version" in
# includes the commit hash.
commit=${mod_version##*-*-}
version=${mod_version%%-*}
echo "v0.0.0-0-g$commit"
echo "$version-0-g$commit"
exit 0
;;
esac

Loading…
Cancel
Save