This is an automated email from the ASF dual-hosted git repository.
jrmccluskey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 3dee026a2ab Update staticcheck version to fix breakage. (#32614)
3dee026a2ab is described below
commit 3dee026a2ab2f100f40de04323cafeaf51281e4a
Author: Robert Burke <[email protected]>
AuthorDate: Tue Oct 1 10:38:03 2024 -0700
Update staticcheck version to fix breakage. (#32614)
* Update staticcheck version.
* Add the workflow itself to it's trigger condition.
* go mod tidy
* [staticcheck] remove redundant nil checks
---------
Co-authored-by: lostluck <[email protected]>
---
.github/workflows/go_tests.yml | 4 ++--
sdks/go.mod | 1 +
sdks/go/pkg/beam/core/runtime/harness/harness.go | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/go_tests.yml b/.github/workflows/go_tests.yml
index 6818e92bc67..e85c4eba866 100644
--- a/.github/workflows/go_tests.yml
+++ b/.github/workflows/go_tests.yml
@@ -28,7 +28,7 @@ on:
pull_request:
branches: ['master', 'release-*']
tags: ['v*']
- paths: ['sdks/go/pkg/**', 'sdks/go.mod', 'sdks/go.sum',
'sdks/go/container/*', 'sdks/java/container/*', 'sdks/python/container/*',
'sdks/typescript/container/*']
+ paths: ['sdks/go/pkg/**', 'sdks/go.mod', 'sdks/go.sum',
'sdks/go/container/*', 'sdks/java/container/*', 'sdks/python/container/*',
'sdks/typescript/container/*', '.github/workflows/go_test.yml']
workflow_dispatch:
# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
@@ -64,6 +64,6 @@ jobs:
go vet --copylocks=false --unsafeptr=false ./...
- name: Run Staticcheck
run: |
- go install "honnef.co/go/tools/cmd/[email protected]"
+ go install "honnef.co/go/tools/cmd/[email protected]"
cd sdks/go/pkg/beam
$(go env GOPATH)/bin/staticcheck ./...
diff --git a/sdks/go.mod b/sdks/go.mod
index 93f82acc2ee..48939706866 100644
--- a/sdks/go.mod
+++ b/sdks/go.mod
@@ -69,6 +69,7 @@ require (
require (
github.com/avast/retry-go/v4 v4.6.0
github.com/fsouza/fake-gcs-server v1.49.2
+ github.com/golang/protobuf v1.5.4
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
)
diff --git a/sdks/go/pkg/beam/core/runtime/harness/harness.go
b/sdks/go/pkg/beam/core/runtime/harness/harness.go
index 08e7f6ddaa7..20aad81c123 100644
--- a/sdks/go/pkg/beam/core/runtime/harness/harness.go
+++ b/sdks/go/pkg/beam/core/runtime/harness/harness.go
@@ -607,7 +607,7 @@ func (c *control) handleInstruction(ctx context.Context,
req *fnpb.InstructionRe
var pRoots []*fnpb.BundleApplication
var rRoots []*fnpb.DelayedBundleApplication
- if sr.PS != nil && len(sr.PS) > 0 && sr.RS != nil && len(sr.RS)
> 0 {
+ if len(sr.PS) > 0 && len(sr.RS) > 0 {
pRoots = make([]*fnpb.BundleApplication, len(sr.PS))
for i, p := range sr.PS {
pRoots[i] = &fnpb.BundleApplication{
