From 63103eca1b67c9bffa2bf9b22bf29a3bd5e4e325 Mon Sep 17 00:00:00 2001
From: arknoll <alex.knoll@acquia.com>
Date: Tue, 3 Jan 2017 13:53:13 -0600
Subject: [PATCH 1/3] Add tagging of remote repo.

---
 phing/tasks/deploy.xml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/phing/tasks/deploy.xml b/phing/tasks/deploy.xml
index f26eb1aea..45f1c2fc1 100644
--- a/phing/tasks/deploy.xml
+++ b/phing/tasks/deploy.xml
@@ -18,6 +18,10 @@
                     promptText="Enter a deploy branch (defaults to [current branch]-build)"
                     promptCharacter=":"
                     defaultValue="${branch.current}-build"/>
+    <propertyprompt propertyName="deploy.tag" useExistingValue="true"
+                    promptText="Enter the name of the tag to create"
+                    promptCharacter=":"
+                    defaultValue=""/>
 
     <!-- Check necessary runtime parameters. -->
     <if>
@@ -47,6 +51,14 @@
     <!--Commit artifact. -->
     <phingcall target="deploy:commit"/>
 
+    <!-- Commit tag if present -->
+    <if>
+      <isset property="deploy.tag"/>
+      <then>
+        <phingcall target="deploy:tag"/>
+      </then>
+    </if>
+
     <!-- Push up changes to remotes if this is not a dry run.-->
     <if>
       <not><isset property="deploy.dryRun"/></not>
@@ -54,6 +66,7 @@
         <phingcall target="deploy:push-all"/>
       </then>
     </if>
+
   </target>
 
   <target name="deploy:remote:add" description="Adds a git remote and checks out deploy branch from upstream." hidden="true">
@@ -157,6 +170,16 @@
     <exec command="echo ${deploy.remote} | openssl md5 | cut -d' ' -f 2" outputProperty="remoteName"/>
     <exec command="git push ${remoteName} ${deploy.branch}" dir="${deploy.dir}" outputProperty="deploy.push.output" logoutput="true" checkreturn="true" level="${blt.exec_level}"/>
     <exec command="export DEPLOY_UPTODATE=$(echo '${deploy.push.output}' | grep --quiet 'Everything up-to-date')" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>
+
+    <!-- Push tag if present -->
+    <if>
+      <isset property="deploy.tag"/>
+      <then>
+        <exec command="echo ${deploy.remote} | openssl md5 | cut -d' ' -f 2" outputProperty="remoteName"/>
+        <exec command="git push ${remoteName} ${deploy.tag}-build" dir="${deploy.dir}" outputProperty="deploy.push.output" logoutput="true" checkreturn="true" level="${blt.exec_level}"/>
+        <exec command="export DEPLOY_UPTODATE=$(echo '${deploy.push.output}' | grep --quiet 'Everything up-to-date')" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>
+      </then>
+    </if>
   </target>
 
   <target name="deploy:sanitize" description="Removes sensitive files from the deploy docroot." hidden="true">
@@ -179,4 +202,9 @@
       <property name="cm.core.config-dir" value="vcs"/>
     </phingcall>
   </target>
+
+  <target name="deploy:tag" description="Tag repository.">
+    <!-- Add -build to tag. -->
+    <exec command="git tag -a ${deploy.tag}-build -m '${deploy.commitMsg}'" dir="${deploy.dir}" logoutput="true" level="${blt.exec_level}" passthru="true"/>
+  </target>
 </project>

From 45533c215e18f6f650c59b24c59960b4f6200dc7 Mon Sep 17 00:00:00 2001
From: arknoll <alex.knoll@acquia.com>
Date: Tue, 3 Jan 2017 16:11:16 -0600
Subject: [PATCH 2/3] blt-830 - Add additional deploy check to determine if tag
 should be created.

---
 phing/tasks/deploy.xml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/phing/tasks/deploy.xml b/phing/tasks/deploy.xml
index 45f1c2fc1..bbbeb9584 100644
--- a/phing/tasks/deploy.xml
+++ b/phing/tasks/deploy.xml
@@ -18,10 +18,27 @@
                     promptText="Enter a deploy branch (defaults to [current branch]-build)"
                     promptCharacter=":"
                     defaultValue="${branch.current}-build"/>
-    <propertyprompt propertyName="deploy.tag" useExistingValue="true"
-                    promptText="Enter the name of the tag to create"
-                    promptCharacter=":"
-                    defaultValue=""/>
+
+    <if>
+      <isset property="deploy.tag"/>
+      <then>
+        <property name="deploy.tag.create" value="y" />
+      </then>
+    </if>
+
+    <propertyprompt promptText="Would you like to create a tag? [y/n]"
+                    useExistingValue="true"
+                    propertyName="deploy.tag.create"
+                    defaultValue="n"/>
+    <if>
+      <equals arg1="${deploy.tag.create}" arg2="y" casesensitive="false"/>
+      <then>
+        <propertyprompt propertyName="deploy.tag" useExistingValue="true"
+                        promptText="Enter the name of the tag to create"
+                        promptCharacter=":"
+                        defaultValue=""/>
+      </then>
+    </if>
 
     <!-- Check necessary runtime parameters. -->
     <if>

From 6d9f00df2ee23d96ecfb5da56f106fe670b7f49f Mon Sep 17 00:00:00 2001
From: arknoll <alex.knoll@acquia.com>
Date: Tue, 3 Jan 2017 16:13:07 -0600
Subject: [PATCH 3/3] blt-830 - code cleanup based on review.

---
 phing/tasks/deploy.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phing/tasks/deploy.xml b/phing/tasks/deploy.xml
index bbbeb9584..85ae4c1a9 100644
--- a/phing/tasks/deploy.xml
+++ b/phing/tasks/deploy.xml
@@ -192,7 +192,6 @@
     <if>
       <isset property="deploy.tag"/>
       <then>
-        <exec command="echo ${deploy.remote} | openssl md5 | cut -d' ' -f 2" outputProperty="remoteName"/>
         <exec command="git push ${remoteName} ${deploy.tag}-build" dir="${deploy.dir}" outputProperty="deploy.push.output" logoutput="true" checkreturn="true" level="${blt.exec_level}"/>
         <exec command="export DEPLOY_UPTODATE=$(echo '${deploy.push.output}' | grep --quiet 'Everything up-to-date')" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>
       </then>