Skip to content

Commit c1bbc5d

Browse files
committed
all: make integration test work on darwin/arm64
Skip tests with Go versions prior to 1.16. Bump test version for Go 1.17 and 1.18 to latest. Change-Id: I740bbc63bf35362fcfad3cf0e07ea4bd0ee56748 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/418675 Reviewed-by: Lasse Folger <lassefolger@google.com>
1 parent 5f429f7 commit c1bbc5d

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

integration_test.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,21 @@ var (
3838
protobufVersion = "3.15.3"
3939
protobufSHA256 = "" // ignored if protobufVersion is a git hash
4040

41-
golangVersions = []string{"1.11.13", "1.12.17", "1.13.15", "1.14.15", "1.15.15", "1.16.15", "1.17.10", "1.18.1"}
42-
golangLatest = golangVersions[len(golangVersions)-1]
41+
golangVersions = func() []string {
42+
var vers []string
43+
switch runtime.GOOS + "/" + runtime.GOARCH {
44+
case "darwin/arm64":
45+
default:
46+
vers = []string{"1.11.13", "1.12.17", "1.13.15", "1.14.15", "1.15.15"}
47+
}
48+
return append(vers, "1.16.15", "1.17.12", "1.18.4")
49+
}()
50+
golangLatest = golangVersions[len(golangVersions)-1]
4351

4452
staticcheckVersion = "2022.1.2"
4553
staticcheckSHA256s = map[string]string{
4654
"darwin/amd64": "baa35f8fb967ee2aacad57f026e3724fbf8d9b7ad8f682f4d44b2084a96e103b",
55+
"darwin/arm64": "9f01a581eeea088d0a6272538360f6d84996d66ae554bfada8026fe24991daa0",
4756
"linux/386": "4cf74373e5d668b265d7a241b59ba7d26064f2cd6af50b77e62c2b3e2f3afb43",
4857
"linux/amd64": "6dbb7187e43812fa23363cdaaa90ab13544dd36e24d02e2347014e4cf265f06d",
4958
}

0 commit comments

Comments
 (0)