From 6aa5b253b5484b2ecc5179c66e5393ab092b4b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Ko=C5=82odziejczyk?= Date: Wed, 31 Jan 2024 10:24:27 +0100 Subject: [PATCH] publising fix --- ci/run-pipeline.sh | 3 ++- ci/upload-files-to-s3.sh | 19 +++++++++++++++++++ es60x/build.gradle | 3 +-- es61x/build.gradle | 3 +-- es62x/build.gradle | 3 +-- es63x/build.gradle | 3 +-- es65x/build.gradle | 3 +-- es66x/build.gradle | 3 +-- es67x/build.gradle | 3 +-- es70x/build.gradle | 3 +-- es710x/build.gradle | 3 +-- es711x/build.gradle | 3 +-- es714x/build.gradle | 3 +-- es716x/build.gradle | 3 +-- es717x/build.gradle | 3 +-- es72x/build.gradle | 3 +-- es73x/build.gradle | 3 +-- es74x/build.gradle | 3 +-- es77x/build.gradle | 3 +-- es78x/build.gradle | 3 +-- es79x/build.gradle | 3 +-- es80x/build.gradle | 3 +-- es810x/build.gradle | 3 +-- es811x/build.gradle | 3 +-- es812x/build.gradle | 3 +-- es81x/build.gradle | 3 +-- es82x/build.gradle | 3 +-- es83x/build.gradle | 3 +-- es84x/build.gradle | 3 +-- es85x/build.gradle | 3 +-- es87x/build.gradle | 3 +-- es88x/build.gradle | 3 +-- es89x/build.gradle | 3 +-- 33 files changed, 52 insertions(+), 63 deletions(-) create mode 100755 ci/upload-files-to-s3.sh diff --git a/ci/run-pipeline.sh b/ci/run-pipeline.sh index 33560677a6..d78b41a5c5 100755 --- 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 new file mode 100755 index 0000000000..d764d3b32e --- /dev/null +++ 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" \ No newline at end of file diff --git a/es60x/build.gradle b/es60x/build.gradle index cb555616d4..71a887078e 100644 --- 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 index cb555616d4..71a887078e 100644 --- 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 index 7f0d40f39f..7618243e20 100644 --- 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 index 73fc6e1c30..a112f275be 100644 --- 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 index 8042fa6a15..ecefec9cbe 100644 --- 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 index 464d69bdc1..818acb65c9 100644 --- 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 index 6187904139..b0531db40f 100644 --- 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 index 8042fa6a15..ecefec9cbe 100644 --- 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 index 3d4666a03f..1896b4a943 100644 --- 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 index 271d4b0a4d..3759e70713 100644 --- 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 index 94c01219f9..638c5b0662 100644 --- 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 index d938967649..26b162229f 100644 --- 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 index c7ca4bf45c..d60f088eaf 100644 --- 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 index 8042fa6a15..ecefec9cbe 100644 --- 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 index 8042fa6a15..ecefec9cbe 100644 --- 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 index 51f8a2c94f..6f81e37b33 100644 --- 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 index 3d4666a03f..1896b4a943 100644 --- 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 index 3d4666a03f..1896b4a943 100644 --- 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 index 3d4666a03f..1896b4a943 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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 index 7571c1df47..4ff8836a88 100644 --- 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) { diff --git a/es89x/build.gradle b/es89x/build.gradle index 7571c1df47..4ff8836a88 100644 --- a/es89x/build.gradle +++ b/es89x/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) {