Skip to content

Commit 8d99221

Browse files
committed
Add GOARM64 and GORISCV64 values to our versions.json
These are (currently) unused, so this is simply added data for completeness (as evidenced by the lack of generated `Dockerfile` changes). This will matter more if/when we implement tip (although these values are currently the default values anyhow, so this is just being completely explicit in case those defaults ever change to match the weird way `GOARM` works with a default value on *some* platforms but a detected value on others).
1 parent cc3386b commit 8d99221

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

versions.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,8 @@
455455
"sha256": "62788056693009bcf7020eedc778cdd1781941c6145eab7688bd087bce0f8659",
456456
"env": {
457457
"GOOS": "linux",
458-
"GOARCH": "arm64"
458+
"GOARCH": "arm64",
459+
"GOARM64": "v8.0"
459460
},
460461
"supported": true
461462
},
@@ -735,7 +736,8 @@
735736
"sha256": "a87726205f1a283247f877ccae8ce147ff4e77ac802382647ac52256eb5642c7",
736737
"env": {
737738
"GOOS": "linux",
738-
"GOARCH": "riscv64"
739+
"GOARCH": "riscv64",
740+
"GORISCV64": "rva20u64"
739741
},
740742
"supported": true
741743
},

versions.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,18 @@ for version in "${versions[@]}"; do
140140
# i386 in Debian is non-SSE2, Alpine appears to be similar (but interesting, not FreeBSD?)
141141
{ GOARCH: "386", GO386: "softfloat" }
142142
elif $bashbrewArch == "amd64" then
143-
# https://tip.golang.org/doc/go1.18#amd64
143+
# https://go.dev/doc/go1.18#amd64
144144
{ GOAMD64: "v1" }
145145
# TODO ^^ figure out what to do with GOAMD64 / GO386 if/when the OS baselines change and these choices needs to be per-variant /o\ (probably move it to the template instead, in fact, since that is where we can most easily toggle based on variant)
146+
elif $bashbrewArch == "riscv64" and env.version != "1.22" then
147+
# https://go.dev/doc/go1.23#riscv
148+
{ GORISCV64: "rva20u64" }
146149
elif $bashbrewArch | startswith("arm64v") then
147-
{ GOARCH: "arm64" } # TODO do something with arm64 variant
150+
{ GOARCH: "arm64" }
151+
+ if env.version != "1.22" then {
152+
# https://go.dev/doc/go1.23#arm64
153+
GOARM64: ($bashbrewArch | ltrimstr("arm64") | if index(".") then . else . + ".0" end),
154+
} else {} end
148155
elif $bashbrewArch | startswith("arm32v") then
149156
{ GOARCH: "arm", GOARM: ($bashbrewArch | ltrimstr("arm32v")) }
150157
else {} end

0 commit comments

Comments
 (0)