You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by rh...@apache.org on 2020/07/20 16:00:31 UTC
[geode] branch develop updated: GEODE-8369: Do not build docker
images on Windows for geode-assembly:acceptanceTest (#5384)
This is an automated email from the ASF dual-hosted git repository.
rhoughton pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 25c15e9 GEODE-8369: Do not build docker images on Windows for geode-assembly:acceptanceTest (#5384)
25c15e9 is described below
commit 25c15e94983c14a6947e0268989388ff4e4967de
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Mon Jul 20 08:59:57 2020 -0700
GEODE-8369: Do not build docker images on Windows for geode-assembly:acceptanceTest (#5384)
---
geode-assembly/build.gradle | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 96cc137..0b334ba 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -19,6 +19,7 @@ apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
apply from: "${rootDir}/${scriptDir}/warnings.gradle"
import org.apache.geode.gradle.plugins.DependencyConstraints
+import org.apache.tools.ant.taskdefs.condition.Os
import java.nio.file.Paths
@@ -689,7 +690,9 @@ docker {
}
acceptanceTest {
- dependsOn(tasks.docker)
+ if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
+ dependsOn(tasks.docker)
+ }
}
apply from: Paths.get("${rootDir}", 'gradle', 'japicmp.gradle')