[beam] branch master updated: [BEAM-12051] fix target/go-licenses: no such file or directory

[heejong]

This is an automated email from the ASF dual-hosted git repository.

heejong 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 c33ff67  [BEAM-12051] fix target/go-licenses: no such file or directory
     new c83a56d  Merge pull request #14336 from ihji/BEAM-12051
c33ff67 is described below

commit c33ff676285bcee86a3a09ba29a91c053ea98d07
Author: Heejong Lee <heej...@gmail.com>
AuthorDate: Thu Mar 25 00:23:07 2021 -0700

    [BEAM-12051] fix target/go-licenses: no such file or directory
---
 sdks/go/container/build.gradle      | 6 ++++++
 sdks/java/container/common.gradle   | 2 +-
 sdks/python/container/common.gradle | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sdks/go/container/build.gradle b/sdks/go/container/build.gradle
index 31fcee8..39aa746 100644
--- a/sdks/go/container/build.gradle
+++ b/sdks/go/container/build.gradle
@@ -69,4 +69,10 @@ if 
(project.rootProject.hasProperty(["docker-pull-licenses"])) {
     dependsOn ':release:go-licenses:go:createLicenses'
   }
   dockerPrepare.dependsOn 'copyGolangLicenses'
+} else {
+  task skipPullLicenses(type: Exec) {
+    executable "sh"
+    args "-c", "mkdir -p build/target/go-licenses"
+  }
+  dockerPrepare.dependsOn 'skipPullLicenses'
 }
diff --git a/sdks/java/container/common.gradle 
b/sdks/java/container/common.gradle
index a01ee69..a325078 100644
--- a/sdks/java/container/common.gradle
+++ b/sdks/java/container/common.gradle
@@ -73,7 +73,7 @@ task copyGolangLicenses(type: Copy) {
 
 task skipPullLicenses(type: Exec) {
     executable "sh"
-    args "-c", "mkdir -p build/target/third_party_licenses && touch 
build/target/third_party_licenses/skip"
+    args "-c", "mkdir -p build/target/go-licenses 
build/target/third_party_licenses && touch 
build/target/third_party_licenses/skip"
 }
 
 docker {
diff --git a/sdks/python/container/common.gradle 
b/sdks/python/container/common.gradle
index 9fedf93..8b0f91b 100644
--- a/sdks/python/container/common.gradle
+++ b/sdks/python/container/common.gradle
@@ -79,4 +79,10 @@ if 
(project.rootProject.hasProperty(["docker-pull-licenses"])) {
     dependsOn ':release:go-licenses:py:createLicenses'
   }
   dockerPrepare.dependsOn 'copyGolangLicenses'
+} else {
+  task skipPullLicenses(type: Exec) {
+    executable "sh"
+    args "-c", "mkdir -p build/target/go-licenses"
+  }
+  dockerPrepare.dependsOn 'skipPullLicenses'
 }