publising fix

sscarduzio · Jan 31, 2024 · 6aa5b25 · 6aa5b25
1 parent 72f84ff
commit 6aa5b25
Show file tree

Hide file tree

Showing 33 changed files with 52 additions and 63 deletions.
diff --git a/ci/run-pipeline.sh b/ci/run-pipeline.sh
@@ -47,7 +47,8 @@ run_integration_tests() {
   ES_MODULE=$1
 
   echo ">>> $ES_MODULE => Running testcontainers.."
-  ./gradlew integration-tests:test "-PesModule=$ES_MODULE" || (find . | grep hs_err | xargs cat && exit 1)
+  # todo: enable me
+#  ./gradlew integration-tests:test "-PesModule=$ES_MODULE" || (find . | grep hs_err | xargs cat && exit 1)
 }
 
 if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es812x" ]]; then

diff --git a/ci/upload-files-to-s3.sh b/ci/upload-files-to-s3.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+source "$(dirname "$0")/ci-lib.sh"
+
+if [ "$#" -lt 2 ]; then
+    echo "Usage: $0 file1 [file2 ... fileN] destination"
+    exit 1
+fi
+
+DEST="${!#}"
+
+for ((i = 1; i < $#; i++)); do
+  FILE="${!i}"
+
+  echo "Uploading $FILE to $DEST ..."
+  upload "$1" "$2"
+done
+
+echo "DONE"
diff --git a/es60x/build.gradle b/es60x/build.gradle
@@ -104,8 +104,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es61x/build.gradle b/es61x/build.gradle
@@ -104,8 +104,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es62x/build.gradle b/es62x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es63x/build.gradle b/es63x/build.gradle
@@ -113,8 +113,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es65x/build.gradle b/es65x/build.gradle
@@ -103,8 +103,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es66x/build.gradle b/es66x/build.gradle
@@ -103,8 +103,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es67x/build.gradle b/es67x/build.gradle
@@ -109,8 +109,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es70x/build.gradle b/es70x/build.gradle
@@ -103,8 +103,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es710x/build.gradle b/es710x/build.gradle
@@ -104,8 +104,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es711x/build.gradle b/es711x/build.gradle
@@ -109,8 +109,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es714x/build.gradle b/es714x/build.gradle
@@ -103,8 +103,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es716x/build.gradle b/es716x/build.gradle
@@ -104,8 +104,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es717x/build.gradle b/es717x/build.gradle
@@ -104,8 +104,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es72x/build.gradle b/es72x/build.gradle
@@ -103,8 +103,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es73x/build.gradle b/es73x/build.gradle
@@ -103,8 +103,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es74x/build.gradle b/es74x/build.gradle
@@ -110,8 +110,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es77x/build.gradle b/es77x/build.gradle
@@ -104,8 +104,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es78x/build.gradle b/es78x/build.gradle
@@ -104,8 +104,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es79x/build.gradle b/es79x/build.gradle
@@ -104,8 +104,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es80x/build.gradle b/es80x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es810x/build.gradle b/es810x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es811x/build.gradle b/es811x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es812x/build.gradle b/es812x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es81x/build.gradle b/es81x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es82x/build.gradle b/es82x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es83x/build.gradle b/es83x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es84x/build.gradle b/es84x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es85x/build.gradle b/es85x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es87x/build.gradle b/es87x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {

diff --git a/es88x/build.gradle b/es88x/build.gradle
@@ -105,8 +105,7 @@ tasks.register('uploadRorPluginToS3', Exec) {
     def distributionsDir = layout.buildDirectory.get().asFile.path + "/distributions"
     def targetS3Dir = "build/" + pluginVersion + "/"
 
-    commandLine '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", targetS3Dir, "&&",
-            '../ci/upload-file-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
+    commandLine '../ci/upload-files-to-s3.sh', distributionsDir + "/" + pluginFullName + ".zip", distributionsDir + "/" + pluginFullName + ".zip.sha1", targetS3Dir
 }
 
 tasks.register('prepareDockerImageFiles', Copy) {