From e36d3736827dd3e1e3112fc1b47f7d567ee5c623 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 25 Nov 2021 18:18:09 +0100 Subject: build: switch to go.dev Signed-off-by: Jason A. Donenfeld --- Makefile | 4 ++-- build.bat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 623af548..0094c235 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ define download = if ! mv $$@.unverified $$@; then rm -f $$@.unverified; exit 1; fi endef -$(eval $(call download,go.tar.gz,https://golang.org/dl/go1.17.3.linux-amd64.tar.gz,550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c)) +$(eval $(call download,go.tar.gz,https://go.dev/dl/go1.17.3.linux-amd64.tar.gz,550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c)) $(eval $(call download,wireguard-nt.zip,https://download.wireguard.com/wireguard-nt/wireguard-nt-0.10.1.zip,772c0b1463d8d2212716f43f06f4594d880dea4f735165bd68e388fc41b81605)) .deps/go/prepared: .distfiles/go.tar.gz $(wildcard go-patches/*.patch) @@ -72,7 +72,7 @@ remaster: .deps/go/prepared rm -f go.sum go.mod cp go.mod.master go.mod go get -d - sed -i $(shell curl -L https://golang.org/dl/?mode=json | jq -r '(".windows-amd64.zip",".linux-amd64.tar.gz") as $$suffix | .[0].files[] | select(.filename|endswith($$suffix)) | ("-e", "s/go[0-9][^ ]*\\\($$suffix)\\([ ,]\\)[a-f0-9]\\+/\(.filename)\\1\(.sha256)/") | @sh') Makefile build.bat + sed -i $(shell curl -L https://go.dev/dl/?mode=json | jq -r '(".windows-amd64.zip",".linux-amd64.tar.gz") as $$suffix | .[0].files[] | select(.filename|endswith($$suffix)) | ("-e", "s/go[0-9][^ ]*\\\($$suffix)\\([ ,]\\)[a-f0-9]\\+/\(.filename)\\1\(.sha256)/") | @sh') Makefile build.bat fmt: export GOARCH := amd64 fmt: .deps/go/prepared diff --git a/build.bat b/build.bat index 77e1702f..1a837285 100644 --- a/build.bat +++ b/build.bat @@ -13,7 +13,7 @@ if exist .deps\prepared goto :render rmdir /s /q .deps 2> NUL mkdir .deps || goto :error cd .deps || goto :error - call :download go.zip https://golang.org/dl/go1.17.3.windows-amd64.zip e78684b955742e215926204afc6ed62b9d165b509e25a687d62902516f08726b || goto :error + call :download go.zip https://go.dev/dl/go1.17.3.windows-amd64.zip e78684b955742e215926204afc6ed62b9d165b509e25a687d62902516f08726b || goto :error rem Mirror of https://github.com/mstorsjo/llvm-mingw/releases/download/20201020/llvm-mingw-20201020-msvcrt-x86_64.zip call :download llvm-mingw-msvcrt.zip https://download.wireguard.com/windows-toolchain/distfiles/llvm-mingw-20201020-msvcrt-x86_64.zip 2e46593245090df96d15e360e092f0b62b97e93866e0162dca7f93b16722b844 || goto :error rem Mirror of https://imagemagick.org/download/binaries/ImageMagick-7.0.8-42-portable-Q16-x64.zip -- cgit v1.2.3-59-g8ed1b