This is an automated email from the ASF dual-hosted git repository.
lostluck 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 97a4a19 [BEAM-11647] Fix go:goBuild gradle rules for build collision
(#13958)
97a4a19 is described below
commit 97a4a193682e4e53a1937f455f81ba0b60609615
Author: Robert Burke <[email protected]>
AuthorDate: Thu Feb 11 10:18:28 2021 -0800
[BEAM-11647] Fix go:goBuild gradle rules for build collision (#13958)
---
sdks/go/build.gradle | 5 +++--
sdks/go/test/run_integration_tests.sh | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sdks/go/build.gradle b/sdks/go/build.gradle
index f5d1864..7c29b6a 100644
--- a/sdks/go/build.gradle
+++ b/sdks/go/build.gradle
@@ -29,11 +29,12 @@ golang {
// of pkg. Go build refuses to follow symlinks. Drop for now. The files
// are built when tested anyway.
+ targetPlatform = ['linux-amd64']
// Build debugging utilities
- go 'build -o ./build/bin/beamctl
github.com/apache/beam/sdks/go/cmd/beamctl'
+ go 'build -o ./build/bin/linux-amd64/beamctl
github.com/apache/beam/sdks/go/cmd/beamctl'
// Build integration test driver
- go 'build -o ./build/bin/integration/driver
github.com/apache/beam/sdks/go/test/integration/driver'
+ go 'build -o ./build/bin/linux-amd64/integration/driver
github.com/apache/beam/sdks/go/test/integration/driver'
}
// Ignore spurious vet errors during check for [BEAM-4831].
diff --git a/sdks/go/test/run_integration_tests.sh
b/sdks/go/test/run_integration_tests.sh
index eff6c96..107c0b6 100755
--- a/sdks/go/test/run_integration_tests.sh
+++ b/sdks/go/test/run_integration_tests.sh
@@ -202,7 +202,7 @@ s.close()
fi
echo ">>> RUNNING $RUNNER INTEGRATION TESTS"
-./sdks/go/build/bin/integration/driver \
+./sdks/go/build/bin/linux-amd64/integration/driver \
--runner=$RUNNER \
--project=$DATAFLOW_PROJECT \
--region=$REGION \
