From 9b07f33d7758162faf8d51253d6ffd764998f756 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 14 Aug 2025 13:27:38 -0700 Subject: [PATCH] Makefile, go.mod: bump oss, adjust how we do so Signed-off-by: Brad Fitzpatrick --- Makefile | 4 ++-- go.mod | 6 +++--- go.sum | 8 ++++---- go.toolchain.rev | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 685ea19..273f419 100644 --- a/Makefile +++ b/Makefile @@ -279,10 +279,10 @@ bump_version_code: .PHONY: update-oss ## Update the tailscale.com go module update-oss: + curl -f https://raw.githubusercontent.com/tailscale/tailscale/refs/heads/main/go.toolchain.rev > go.toolchain.rev.new + mv go.toolchain.rev.new go.toolchain.rev GOPROXY=direct ./tool/go get tailscale.com@main ./tool/go mod tidy -compat=1.24 - ./tool/go run tailscale.com/cmd/printdep --go > go.toolchain.rev.new - mv go.toolchain.rev.new go.toolchain.rev # Get the commandline tools package, this provides (among other things) the sdkmanager binary. $(ANDROID_HOME)/cmdline-tools/latest/bin/sdkmanager: diff --git a/go.mod b/go.mod index 05da9e2..f62b5ae 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/tailscale/tailscale-android -go 1.24.4 +go 1.24.6 require ( github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da golang.org/x/mobile v0.0.0-20240806205939-81131f6468ab - tailscale.com v1.87.0-pre.0.20250801224156-0f15e4419683 + tailscale.com v1.87.0-pre.0.20250814174806-c083a9b05330 ) require ( @@ -68,7 +68,7 @@ require ( github.com/tailscale/web-client-prebuilt v0.0.0-20250124233751-d4cd19a26976 // indirect github.com/tailscale/xnet v0.0.0-20240729143630-8497ac4dab2e // indirect github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect - github.com/vishvananda/netns v0.0.4 // indirect + github.com/vishvananda/netns v0.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect diff --git a/go.sum b/go.sum index 11b45be..58d4d79 100644 --- a/go.sum +++ b/go.sum @@ -174,8 +174,8 @@ github.com/u-root/u-root v0.14.0/go.mod h1:hAyZorapJe4qzbLWlAkmSVCJGbfoU9Pu4jpJ1 github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 h1:pyC9PaHYZFgEKFdlp3G8RaCKgVpHZnecvArXvPXcFkM= github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701/go.mod h1:P3a5rG4X7tI17Nn3aOIAYr5HbIMukwXG0urG0WuL8OA= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8= -github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= +github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY= +github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= @@ -235,5 +235,5 @@ howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k= software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI= -tailscale.com v1.87.0-pre.0.20250801224156-0f15e4419683 h1:meEUX1Nsr5SaXiaeivOGG4c7gsQm/P3Jr3dzbtE0j6k= -tailscale.com v1.87.0-pre.0.20250801224156-0f15e4419683/go.mod h1:Lm8dnzU2i/Emw15r6sl3FRNp/liSQ/nYw6ZSQvIdZ1M= \ No newline at end of file +tailscale.com v1.87.0-pre.0.20250814174806-c083a9b05330 h1:AKtuZB1fqLwc7gjGtTpFRTDBFyIV+H4nqm3S3saKGus= +tailscale.com v1.87.0-pre.0.20250814174806-c083a9b05330/go.mod h1:7T150+pAJhl3Yw2RTBMihVa9D2wdGJ+kxVQQSJbLHkc= diff --git a/go.toolchain.rev b/go.toolchain.rev index 33aa564..6e3bd7f 100644 --- a/go.toolchain.rev +++ b/go.toolchain.rev @@ -1 +1 @@ -1cd3bf1a6eaf559aa8c00e749289559c884cef09 +54f31cd8fc7b3d7d87c1ea455c8bb4b33372f706