Fix time-diff arg position

1 files changed, 11 insertions, 11 deletions

diff --git a/deployment/build.gradle b/deployment/build.gradle
index b3d58aba2..c62b77143 100644
--- a/deployment/build.gradle
+++ b/deployment/build.gradle
@@ -42,13 +42,13 @@ long getDaysFromLastCommitFromGit() {
     Instant now = Instant.now()
     Instant timeOfLastCommit = Instant.ofEpochMilli(epochOfLastCommit)
     println("now: ${now}, timeOfLastCommit: ${timeOfLastCommit}")
-    Duration diff = Duration.between(now, timeOfLastCommit)
-    println("diff is ${diff}")
+    Duration diff = Duration.between(timeOfLastCommit, now)
+    println("diff is ${diff}, days ${diff.toDays()}")
     return diff.toDays()
 }
 
-String getTaskNameByStepFor(String processName, long step) {
-    def processSteps = deployments.named(processName).get().environmentSteps
+static String getTaskNameByStepFor(Project project, String processName, long step) {
+    def processSteps = project.deployments.named(processName).get().environmentSteps
     if (step >= processSteps.size()) {
         step = processSteps.size() - 1
     }
@@ -60,7 +60,7 @@ String getTaskNameByStepFor(String processName, long step) {
 def imeOnMasterPush = tasks.register("imeOnMasterPush") {
     it.group "Publishing"
     it.description "Deployment request on master push for IME"
-    it.dependsOn tasks.named(getTaskNameByStepFor("imeMaster", 0))
+    it.dependsOn tasks.named(getTaskNameByStepFor(it.project, "imeMaster", 0))
 }
 
 def imePromoteMaster = tasks.register("imePromoteMaster") {
@@ -70,7 +70,7 @@ def imePromoteMaster = tasks.register("imePromoteMaster") {
     def shouldPromote = Instant.now().toCalendar().toDayOfWeek() == DayOfWeek.WEDNESDAY
     it.onlyIf { shouldPromote }
     if (shouldPromote) {
-        it.dependsOn tasks.named(getTaskNameByStepFor("imeMaster", 1))
+        it.dependsOn tasks.named(getTaskNameByStepFor(it.project, "imeMaster", 1))
     }
 }
 
@@ -78,7 +78,7 @@ def imePromoteMaster = tasks.register("imePromoteMaster") {
 def imeOnReleasePush = tasks.register("imeOnReleasePush") {
     it.group "Publishing"
     it.description "Deployment request on release-branch push for IME"
-    it.dependsOn tasks.named(getTaskNameByStepFor("imeProduction", 0))
+    it.dependsOn tasks.named(getTaskNameByStepFor(it.project, "imeProduction", 0))
 }
 
 def imePromoteRelease = tasks.register("imePromoteRelease") {
@@ -88,7 +88,7 @@ def imePromoteRelease = tasks.register("imePromoteRelease") {
     def days = getDaysFromLastCommitFromGit()
     it.onlyIf { days > 0 }
     if (days > 0) {
-        it.dependsOn tasks.named(getTaskNameByStepFor("imeProduction", days))
+        it.dependsOn tasks.named(getTaskNameByStepFor(it.project, "imeProduction", days))
     }
 }
 //////// end - IME
@@ -99,7 +99,7 @@ def noOpTask = tasks.register("noOpDeployTask")
 def addOnsOnMasterPush = tasks.register("addOnsOnMasterPush") {
     it.group "Publishing"
     it.description "Deployment request on master push for all addons"
-    it.dependsOn tasks.named(getTaskNameByStepFor("addOnsMaster", 0))
+    it.dependsOn tasks.named(getTaskNameByStepFor(it.project, "addOnsMaster", 0))
 }
 
 def addOnsPromoteMaster = tasks.register("addOnsPromoteMaster") {
@@ -112,7 +112,7 @@ def addOnsPromoteMaster = tasks.register("addOnsPromoteMaster") {
 def addOnsOnReleasePush = tasks.register("addOnsOnReleasePush") {
     it.group "Publishing"
     it.description "Deployment request on release-branch push for addons"
-    it.dependsOn tasks.named(getTaskNameByStepFor("addOnsProduction", 0))
+    it.dependsOn tasks.named(getTaskNameByStepFor(it.project, "addOnsProduction", 0))
 }
 
 def addOnsPromoteRelease = tasks.register("addOnsPromoteRelease") {
@@ -122,7 +122,7 @@ def addOnsPromoteRelease = tasks.register("addOnsPromoteRelease") {
     def days = getDaysFromLastCommitFromGit()
     it.onlyIf { days > 0 }
     if (days > 0) {
-        it.dependsOn tasks.named(getTaskNameByStepFor("addOnsProduction", days))
+        it.dependsOn tasks.named(getTaskNameByStepFor(it.project, "addOnsProduction", days))
     }
 }
 //////// end - addons