From 81d3142d62f1cff32cfd7a24c630939e4fe51ac9 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 2 Jun 2016 14:39:35 +0300 Subject: [PATCH] build scripts: add current date/time to the directory name on mac agent when building a snapshot to avoid conflicts --- .../org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy index 4b06daa80f03..799ba67099f0 100644 --- a/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy @@ -23,6 +23,9 @@ import org.jetbrains.intellij.build.BuildContext import org.jetbrains.intellij.build.BuildOptions import org.jetbrains.intellij.build.MacHostProperties +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter + class MacDmgBuilder { private final BuildContext buildContext private final GantBuilder ant @@ -42,6 +45,9 @@ class MacDmgBuilder { 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(':', '-') + } def dmgBuilder = new MacDmgBuilder(buildContext, remoteDir, macHostProperties) if (buildContext.paths.macJreTarGz != null && new File(buildContext.paths.macJreTarGz).exists()) { dmgBuilder.doSignAndBuildDmg(macZipPath, true)