From af960d88f7be792f2c35073c7994e998cb285ccf Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Thu, 26 Aug 2021 09:56:44 -0700 Subject: [PATCH 1/3] github: run extras tests on all supported Go versions --- .github/workflows/testing.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e85c59e44bc..288c3e19999 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -53,6 +53,10 @@ jobs: - type: extras goversion: 1.16 + - type: extras + goversion: 1.15 + - type: extras + goversion: 1.14 - type: tests goversion: 1.16 From a16ef7bbbabb9206a254f98c8598e41659554b84 Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Thu, 26 Aug 2021 10:09:43 -0700 Subject: [PATCH 2/3] github: fold security tests into 'tests'; update testing to 1.17-1.15 --- .github/workflows/testing.yml | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 288c3e19999..7bf81546360 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -41,36 +41,32 @@ jobs: matrix: include: - type: vet+tests - goversion: 1.16 + goversion: 1.17 - type: tests - goversion: 1.16 + goversion: 1.17 testflags: -race - type: tests - goversion: 1.16 + goversion: 1.17 grpcenv: GRPC_GO_RETRY=on - type: extras - goversion: 1.16 - - type: extras - goversion: 1.15 - - type: extras - goversion: 1.14 + goversion: 1.17 - type: tests - goversion: 1.16 + goversion: 1.17 goarch: 386 - type: tests - goversion: 1.16 + goversion: 1.17 goarch: arm64 - type: tests - goversion: 1.15 + goversion: 1.16 - type: tests - goversion: 1.14 + goversion: 1.15 steps: # Setup the environment. @@ -108,6 +104,9 @@ jobs: run: | go version go test ${{ matrix.testflags }} -cpu 1,4 -timeout 7m google.golang.org/grpc/... + cd ${GITHUB_WORKSPACE}/security/advancedtls && go test ${{ matrix.testflags }} -timeout 2m google.golang.org/grpc/security/advancedtls/... + cd ${GITHUB_WORKSPACE}/security/authorization && go test ${{ matrix.testflags }} -timeout 2m google.golang.org/grpc/security/authorization/... + # Non-core gRPC tests (examples, interop, etc) - name: Run extras tests @@ -117,5 +116,3 @@ jobs: examples/examples_test.sh security/advancedtls/examples/examples_test.sh interop/interop_test.sh - cd ${GITHUB_WORKSPACE}/security/advancedtls && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/advancedtls/... - cd ${GITHUB_WORKSPACE}/security/authorization && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/authorization/... From a7069aef83b1f540b9c656b0046dba3f698c1238 Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Thu, 26 Aug 2021 10:24:31 -0700 Subject: [PATCH 3/3] fix go build directives --- channelz/service/func_nonlinux.go | 1 + channelz/service/service_sktopt_test.go | 1 + channelz/service/util_sktopt_386_test.go | 1 + channelz/service/util_sktopt_amd64_test.go | 1 + credentials/alts/alts_test.go | 1 + credentials/alts/utils_test.go | 1 + internal/channelz/types_nonlinux.go | 1 + internal/channelz/util_nonlinux.go | 1 + internal/channelz/util_test.go | 1 + internal/profiling/goid_modified.go | 1 + internal/profiling/goid_regular.go | 1 + internal/syscall/syscall_nonlinux.go | 1 + internal/transport/proxy_test.go | 1 + test/authority_test.go | 1 + test/race.go | 1 + test/tools/tools.go | 1 + xds/internal/httpfilter/fault/fault_test.go | 1 + xds/internal/test/xds_client_integration_test.go | 1 + xds/internal/test/xds_integration_test.go | 1 + xds/internal/test/xds_server_integration_test.go | 1 + xds/internal/test/xds_server_serving_mode_test.go | 1 + 21 files changed, 21 insertions(+) diff --git a/channelz/service/func_nonlinux.go b/channelz/service/func_nonlinux.go index 64ecea947de..473495d6655 100644 --- a/channelz/service/func_nonlinux.go +++ b/channelz/service/func_nonlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux /* diff --git a/channelz/service/service_sktopt_test.go b/channelz/service/service_sktopt_test.go index ecd4a2ad05f..4ea6b20cd6a 100644 --- a/channelz/service/service_sktopt_test.go +++ b/channelz/service/service_sktopt_test.go @@ -1,3 +1,4 @@ +//go:build linux && (386 || amd64) // +build linux // +build 386 amd64 diff --git a/channelz/service/util_sktopt_386_test.go b/channelz/service/util_sktopt_386_test.go index d9c98127136..3ba3dc96e7c 100644 --- a/channelz/service/util_sktopt_386_test.go +++ b/channelz/service/util_sktopt_386_test.go @@ -1,3 +1,4 @@ +//go:build 386 && linux // +build 386,linux /* diff --git a/channelz/service/util_sktopt_amd64_test.go b/channelz/service/util_sktopt_amd64_test.go index 0ff06d12833..124d7b75819 100644 --- a/channelz/service/util_sktopt_amd64_test.go +++ b/channelz/service/util_sktopt_amd64_test.go @@ -1,3 +1,4 @@ +//go:build amd64 && linux // +build amd64,linux /* diff --git a/credentials/alts/alts_test.go b/credentials/alts/alts_test.go index cbb1656d20c..22ad5a48b09 100644 --- a/credentials/alts/alts_test.go +++ b/credentials/alts/alts_test.go @@ -1,3 +1,4 @@ +//go:build linux || windows // +build linux windows /* diff --git a/credentials/alts/utils_test.go b/credentials/alts/utils_test.go index 2231de3dccc..531cdfce6e3 100644 --- a/credentials/alts/utils_test.go +++ b/credentials/alts/utils_test.go @@ -1,3 +1,4 @@ +//go:build linux || windows // +build linux windows /* diff --git a/internal/channelz/types_nonlinux.go b/internal/channelz/types_nonlinux.go index 909edba25a4..8b06eed1ab8 100644 --- a/internal/channelz/types_nonlinux.go +++ b/internal/channelz/types_nonlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux /* diff --git a/internal/channelz/util_nonlinux.go b/internal/channelz/util_nonlinux.go index d600417fb8c..837ddc40240 100644 --- a/internal/channelz/util_nonlinux.go +++ b/internal/channelz/util_nonlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux /* diff --git a/internal/channelz/util_test.go b/internal/channelz/util_test.go index 2621e7410d6..9de6679043d 100644 --- a/internal/channelz/util_test.go +++ b/internal/channelz/util_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux /* diff --git a/internal/profiling/goid_modified.go b/internal/profiling/goid_modified.go index b186499cd0d..ff1a5f5933b 100644 --- a/internal/profiling/goid_modified.go +++ b/internal/profiling/goid_modified.go @@ -1,3 +1,4 @@ +//go:build grpcgoid // +build grpcgoid /* diff --git a/internal/profiling/goid_regular.go b/internal/profiling/goid_regular.go index 891c2e98f9d..042933227d8 100644 --- a/internal/profiling/goid_regular.go +++ b/internal/profiling/goid_regular.go @@ -1,3 +1,4 @@ +//go:build !grpcgoid // +build !grpcgoid /* diff --git a/internal/syscall/syscall_nonlinux.go b/internal/syscall/syscall_nonlinux.go index 121f2946841..999f52cd75b 100644 --- a/internal/syscall/syscall_nonlinux.go +++ b/internal/syscall/syscall_nonlinux.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux /* diff --git a/internal/transport/proxy_test.go b/internal/transport/proxy_test.go index 5434e9ed5c0..404354a19db 100644 --- a/internal/transport/proxy_test.go +++ b/internal/transport/proxy_test.go @@ -1,3 +1,4 @@ +//go:build !race // +build !race /* diff --git a/test/authority_test.go b/test/authority_test.go index 17ae178b73c..15afa759c90 100644 --- a/test/authority_test.go +++ b/test/authority_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux /* diff --git a/test/race.go b/test/race.go index acfa0dfae37..d99f0a410ac 100644 --- a/test/race.go +++ b/test/race.go @@ -1,3 +1,4 @@ +//go:build race // +build race /* diff --git a/test/tools/tools.go b/test/tools/tools.go index 3a614f765f5..646a144ccca 100644 --- a/test/tools/tools.go +++ b/test/tools/tools.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools /* diff --git a/xds/internal/httpfilter/fault/fault_test.go b/xds/internal/httpfilter/fault/fault_test.go index 596fce468ee..695961c129a 100644 --- a/xds/internal/httpfilter/fault/fault_test.go +++ b/xds/internal/httpfilter/fault/fault_test.go @@ -1,3 +1,4 @@ +//go:build !386 // +build !386 /* diff --git a/xds/internal/test/xds_client_integration_test.go b/xds/internal/test/xds_client_integration_test.go index 4465d2146ff..9760e75363e 100644 --- a/xds/internal/test/xds_client_integration_test.go +++ b/xds/internal/test/xds_client_integration_test.go @@ -1,3 +1,4 @@ +//go:build !386 // +build !386 /* diff --git a/xds/internal/test/xds_integration_test.go b/xds/internal/test/xds_integration_test.go index 74d84831520..1973ad4a119 100644 --- a/xds/internal/test/xds_integration_test.go +++ b/xds/internal/test/xds_integration_test.go @@ -1,3 +1,4 @@ +//go:build !386 // +build !386 /* diff --git a/xds/internal/test/xds_server_integration_test.go b/xds/internal/test/xds_server_integration_test.go index 9983c6e4aeb..11ac8fc70c1 100644 --- a/xds/internal/test/xds_server_integration_test.go +++ b/xds/internal/test/xds_server_integration_test.go @@ -1,3 +1,4 @@ +//go:build !386 // +build !386 /* diff --git a/xds/internal/test/xds_server_serving_mode_test.go b/xds/internal/test/xds_server_serving_mode_test.go index f6c3d39a325..995a6794fa8 100644 --- a/xds/internal/test/xds_server_serving_mode_test.go +++ b/xds/internal/test/xds_server_serving_mode_test.go @@ -1,3 +1,4 @@ +//go:build !386 // +build !386 /*