Skip to content

Commit 9730d8b

Browse files
paulzholbradfitz
authored andcommitted
env/freebsd-amd64: update FreeBSD 12.0 to a -RELEASE image
Install GDB from the ports collection, the in-tree was removed from the base system in FreeBSD 12.0, and the older releases have an unsupported (6.1.1 or older version). Updates golang/go#25289 Change-Id: I8899a2a70c0b9ee9171621206431ca24a7e97704 Reviewed-on: https://go-review.googlesource.com/c/155977 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 6a02381 commit 9730d8b

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

dashboard/builders.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ var Hosts = map[string]*HostConfig{
204204
SSHUsername: "gopher",
205205
},
206206
"host-freebsd-12_0": &HostConfig{
207-
VMImage: "freebsd-amd64-120a8",
208-
Notes: "FreeBSD 12.0alpha8; GCE VM is built from script in build/env/freebsd-amd64",
207+
VMImage: "freebsd-amd64-120-v1",
208+
Notes: "FreeBSD 12.0; GCE VM is built from script in build/env/freebsd-amd64",
209209
machineType: "n1-highcpu-4",
210210
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.freebsd-amd64",
211211
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-freebsd-amd64.tar.gz",

env/freebsd-amd64/make.bash

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ case $1 in
5656
readonly SHA256=d8638aecbb13bdc891e17187f3932fe477f5655846bdaad8fecd60614de9312c
5757
;;
5858
12.0)
59-
readonly VERSION=12.0-ALPHA8
60-
readonly IS_SNAPSHOT=1
59+
readonly VERSION=12.0-RELEASE
6160
readonly VERSION_TRAILER=
62-
readonly SHA256=11c69e6511e754a81b0b7c7c35b5fb4eee4c24a9231f77d494cb2e4ac0958576
61+
readonly SHA256=9eb70a552f5395819904ed452a02e5805743459dbb1912ebafe4c9ae5de5eb53
6362
;;
6463
*)
6564
echo "Usage: $0 <version>"
@@ -180,7 +179,7 @@ if {$::env(DOWNLOAD_UPDATES)} {
180179
181180
expect -re $prompt
182181
sleep 1
183-
send "pkg install bash curl git\n"
182+
send "pkg install bash curl git gdb\n"
184183
expect "Do you want to fetch and install it now"
185184
sleep 1
186185
send "y\n"

0 commit comments

Comments
 (0)