Skip to content

Commit 2b38d32

Browse files
committed
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 <[email protected]>
1 parent 3eab35c commit 2b38d32

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ require (
1212
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
1313
golang.org/x/sys v0.0.0-20200812155832-6a926be9bd1d
1414
inet.af/netaddr v0.0.0-20200810144936-56928fe48a98
15-
tailscale.com v1.1.1-0.20201030135043-eab6e9ea4e45
15+
tailscale.com v1.2.2
1616
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,5 @@ inet.af/netaddr v0.0.0-20200810144936-56928fe48a98 h1:bWyWDZP0l6VnQ1TDKf6yNwuiED
208208
inet.af/netaddr v0.0.0-20200810144936-56928fe48a98/go.mod h1:qqYzz/2whtrbWJvt+DNWQyvekNN4ePQZcg2xc2/Yjww=
209209
rsc.io/goversion v1.2.0 h1:SPn+NLTiAG7w30IRK/DKp1BjvpWabYgxlLp/+kx5J8w=
210210
rsc.io/goversion v1.2.0/go.mod h1:Eih9y/uIBS3ulggl7KNJ09xGSLcuNaLgmvvqa07sgfo=
211-
tailscale.com v1.1.1-0.20201030135043-eab6e9ea4e45 h1:7ochIqBH+55Me/eZaIubpMDxl80eoFnoSYYyDrWRhXw=
212-
tailscale.com v1.1.1-0.20201030135043-eab6e9ea4e45/go.mod h1:JEJiCce3MHtPCTdX2ahLc4tcnxZ7b5etish1Yt0B6+w=
211+
tailscale.com v1.2.2 h1:aTrGEGnDMKQtTEKXrkAWcZA1zDvBoOBN3IYOjEgDTV4=
212+
tailscale.com v1.2.2/go.mod h1:JEJiCce3MHtPCTdX2ahLc4tcnxZ7b5etish1Yt0B6+w=

version/tailscale-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ case "$mod_version" in
2525
# includes the commit hash.
2626
commit=${mod_version##*-*-}
2727
version=${mod_version%%-*}
28-
echo "v0.0.0-0-g$commit"
28+
echo "$version-0-g$commit"
2929
exit 0
3030
;;
3131
esac

0 commit comments

Comments
 (0)