From 7fc4ed9c22f851e89c7a2b35055836588da08783 Mon Sep 17 00:00:00 2001 From: Mikhail Filippov Date: Wed, 7 Dec 2016 16:50:45 +0300 Subject: [PATCH] build scripts: change remote dir name on Mac OS machine to avoid conflicts It may happen that several builds with the same number are started simultaneously. Also theoretically builds may start in the same second. (cherry picked from commit eda3c91, IDEA-CR-16653) --- .../jetbrains/intellij/build/impl/MacDmgBuilder.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy index 23674caa088e..97cd1744f4df 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy @@ -65,10 +65,10 @@ class MacDmgBuilder { private static MacDmgBuilder createInstance(BuildContext buildContext, MacDistributionCustomizer customizer, MacHostProperties macHostProperties) { defineTasks(buildContext.ant, "${buildContext.paths.communityHome}/lib") - String remoteDir = "intellij-builds/${buildContext.fullBuildNumber}" - if (remoteDir.toLowerCase().endsWith("snapshot")) { - remoteDir += "-" + LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME).replace(':', '-') - } + String currentDateTimeString = LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME).replace(':', '-') + int randomSeed = new Random().nextInt(Integer.MAX_VALUE) + String remoteDir = "intellij-builds/${buildContext.fullBuildNumber}-${currentDateTimeString}-${randomSeed}" + new MacDmgBuilder(buildContext, customizer, remoteDir, macHostProperties) }