From cb196441f925665f12a89aabf5c71588577c8c89 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 18 Jul 2024 18:36:14 -0400 Subject: [PATCH 1/2] Ensure macos using gsed to avoid sha512 value substitutionissues Signed-off-by: Peter Zhu --- vars/uploadMinSnapshotsToS3.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vars/uploadMinSnapshotsToS3.groovy b/vars/uploadMinSnapshotsToS3.groovy index ab3520c0c..e185a02b4 100644 --- a/vars/uploadMinSnapshotsToS3.groovy +++ b/vars/uploadMinSnapshotsToS3.groovy @@ -52,11 +52,16 @@ void call(Map args = [:]) { echo("Start copying files: version-${version} architecture-${architecture} platform-${platform} buildid-${id} distribution-${distribution} extension-${extension}") + String sedCmd = "sed" + if (platform == "darwin") { + sedCmd = "gsed" + } + sh """ cp -v ${srcDir}/${baseName}.${extension} ${srcDir}/${baseName}-latest.${extension} cp -v ${srcDir}/${baseName}.${extension}.sha512 ${srcDir}/${baseName}-latest.${extension}.sha512 cp -v ${srcDir}/../manifest.yml ${srcDir}/${baseName}-latest.${extension}.build-manifest.yml - sed -i "s/.${extension}/-latest.${extension}/g" ${srcDir}/${baseName}-latest.${extension}.sha512 + ${sedCmd} -i "s/.${extension}/-latest.${extension}/g" ${srcDir}/${baseName}-latest.${extension}.sha512 """ withCredentials([ string(credentialsId: 'jenkins-artifact-promotion-role', variable: 'ARTIFACT_PROMOTION_ROLE_NAME'), From 879efd823e201898f77829a69b03410aec36c20b Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 18 Jul 2024 18:38:21 -0400 Subject: [PATCH 2/2] bump 6.6.1 version Signed-off-by: Peter Zhu --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 326e07f44..bad044279 100644 --- a/build.gradle +++ b/build.gradle @@ -127,7 +127,7 @@ jacocoTestReport { } } -String version = '6.6.0' +String version = '6.6.1' task updateVersion { doLast {