Skip to content

Commit 1b0ecde

Browse files
committed
Upgrade build scripts to go1.21
1 parent cc04792 commit 1b0ecde

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

script/ensure-go-installed.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ if [ -z "$ROOTDIR" ]; then
44
echo 1>&2 'ensure-go-installed.sh invoked without ROOTDIR set!'
55
fi
66

7-
# Is go installed, and at least 1.16?
7+
# Is go installed, and at least 1.21?
88
go_ok() {
99
set -- $(go version 2>/dev/null |
1010
sed -n 's/.*go\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1 \2/p' |
1111
head -n 1)
12-
[ $# -eq 2 ] && [ "$1" -eq 1 ] && [ "$2" -ge 16 ]
12+
[ $# -eq 2 ] && [ "$1" -eq 1 ] && [ "$2" -ge 21 ]
1313
}
1414

1515
# If a local go is installed, use it.
1616
set_up_vendored_go() {
17-
GO_VERSION=go1.16.3
17+
GO_VERSION=go1.21.3
1818
VENDORED_GOROOT="$ROOTDIR/vendor/$GO_VERSION/go"
1919
if [ -x "$VENDORED_GOROOT/bin/go" ]; then
2020
export GOROOT="$VENDORED_GOROOT"

script/install-vendored-go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
#!/bin/sh
22

33
# The checksums below must correspond to the downloads for this version.
4-
GO_VERSION=go1.16.3
4+
# The checksums can be found on https://go.dev/dl
5+
GO_VERSION=go1.21.3
56

67
case "$(uname -s):$(uname -m)" in
78
Linux:x86_64)
89
GO_PKG=${GO_VERSION}.linux-amd64.tar.gz
9-
GO_PKG_SHA=951a3c7c6ce4e56ad883f97d9db74d3d6d80d5fec77455c6ada6c1f7ac4776d2
10+
GO_PKG_SHA=1241381b2843fae5a9707eec1f8fb2ef94d827990582c7c7c32f5bdfbfd420c8
1011
;;
1112
Darwin:x86_64)
1213
GO_PKG=${GO_VERSION}.darwin-amd64.tar.gz
13-
GO_PKG_SHA=6bb1cf421f8abc2a9a4e39140b7397cdae6aca3e8d36dcff39a1a77f4f1170ac
14+
GO_PKG_SHA=27014fc69e301d7588a169ca239b3cc609f0aa1abf38528bf0d20d3b259211eb
1415
;;
1516
Darwin:arm64)
1617
GO_PKG=${GO_VERSION}.darwin-arm64.tar.gz
17-
GO_PKG_SHA=f4e96bbcd5d2d1942f5b55d9e4ab19564da4fad192012f6d7b0b9b055ba4208f
18+
GO_PKG_SHA=65302a7a9f7a4834932b3a7a14cb8be51beddda757b567a2f9e0cbd0d7b5a6ab
1819
;;
1920
*)
2021
echo 1>&2 "I don't know how to install Go on your platform."

0 commit comments

Comments
 (0)