Fixed publish to S3 and Github

vvanholl · vvanholl · commit 1c247056435d · 2018-11-07T21:22:00.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -106,7 +106,7 @@ checkstyle {
 
 task S3Upload(type: S3Upload /*, dependsOn: buildPluginZip*/) {
     bucket = s3_bucket
-    key = "elasticsearch/${project.name}-${version}.zip"
+    key = "elasticsearch/elasticsearch-${project.name}-${version}.zip"
     file = "build/distributions/${project.name}-${version}.zip"
 }
 
@@ -133,7 +133,6 @@ task release() {
             println("SNAPSHOT: Nothing to release !")
         }
     } else {
-//        dependsOn(["S3Upload", "githubRelease"])
-        dependsOn("S3Upload")
+        dependsOn(["S3Upload", "githubRelease"])
     }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-rootProject.name = "elasticsearch-prometheus-exporter"
+rootProject.name = "prometheus-exporter"

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ checkstyle {`
`106`	`106`
`107`	`107`	`task S3Upload(type: S3Upload /, dependsOn: buildPluginZip/) {`
`108`	`108`	`bucket = s3_bucket`
`109`		`- key = "elasticsearch/${project.name}-${version}.zip"`
	`109`	`+ key = "elasticsearch/elasticsearch-${project.name}-${version}.zip"`
`110`	`110`	`file = "build/distributions/${project.name}-${version}.zip"`
`111`	`111`	`}`
`112`	`112`
`@@ -133,7 +133,6 @@ task release() {`
`133`	`133`	`println("SNAPSHOT: Nothing to release !")`
`134`	`134`	`}`
`135`	`135`	`} else {`
`136`		`-// dependsOn(["S3Upload", "githubRelease"])`
`137`		`- dependsOn("S3Upload")`
	`136`	`+ dependsOn(["S3Upload", "githubRelease"])`
`138`	`137`	`}`
`139`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-rootProject.name = "elasticsearch-prometheus-exporter"`
	`1`	`+rootProject.name = "prometheus-exporter"`