Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2019-06-02 16:11:48 -0400
committerJuergen Haug2019-06-03 12:48:40 -0400
commitb8f7bbbbbed9669ca4c334a79b4ebf32d779e7b5 (patch)
tree09be6bcd851e0c25a516cbb60356c319f128383f
parent65a4b468a36e9897855ef21866c871f9d7691ac8 (diff)
downloadorg.eclipse.etrice-b8f7bbbbbed9669ca4c334a79b4ebf32d779e7b5.tar.gz
org.eclipse.etrice-b8f7bbbbbed9669ca4c334a79b4ebf32d779e7b5.tar.xz
org.eclipse.etrice-b8f7bbbbbed9669ca4c334a79b4ebf32d779e7b5.zip
[releng] eclipse promote does not fail for local build
-rw-r--r--releng/org.eclipse.etrice.releng/build.gradle10
-rw-r--r--releng/org.eclipse.etrice.site/build.gradle2
2 files changed, 9 insertions, 3 deletions
diff --git a/releng/org.eclipse.etrice.releng/build.gradle b/releng/org.eclipse.etrice.releng/build.gradle
index d423e0cca..c3ad58b49 100644
--- a/releng/org.eclipse.etrice.releng/build.gradle
+++ b/releng/org.eclipse.etrice.releng/build.gradle
@@ -41,8 +41,14 @@ task assembleArtifacts(type: Sync) {
from([configurations.archives, configurations.updates]) {
into 'archives'
}
- from(zipTree(configurations.updates.singleFile)) {
- into 'updates'
+ if(!configurations.updates.empty) {
+ from(zipTree(configurations.updates.singleFile)) {
+ into 'updates'
+ }
+ } else {
+ doFirst {
+ throw new GradleException("etrice update site is missing - execute tycho/maven 'package' first")
+ }
}
into assembleDir
}
diff --git a/releng/org.eclipse.etrice.site/build.gradle b/releng/org.eclipse.etrice.site/build.gradle
index cbec1e254..991070c1c 100644
--- a/releng/org.eclipse.etrice.site/build.gradle
+++ b/releng/org.eclipse.etrice.site/build.gradle
@@ -3,6 +3,6 @@ configurations {
}
artifacts {
- archive fileTree(dir: 'target', include: 'org.eclipse.etrice.site-*.zip').singleFile
+ archive fileTree(dir: 'target', include: 'org.eclipse.etrice.site-*.zip').files
}

Back to the top