Disabling deploy.tag prompt whenndeploy.branch is set. (#908)

acquia · Jan 4, 2017 · aaeeb25 · aaeeb25
1 parent 6ae0af0
commit aaeeb25
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -113,7 +113,7 @@ script:
 
 deploy:
   provider: script
-  script: cd ../blt-project && blt deploy -Ddeploy.commitMsg="Automated commit by Travis CI for Build ${TRAVIS_BUILD_ID}" -Ddeploy.branch="8.x-build" -Ddeploy.tag.create=n && phpunit tests/phpunit --group=deploy
+  script: cd ../blt-project && blt deploy -Ddeploy.commitMsg="Automated commit by Travis CI for Build ${TRAVIS_BUILD_ID}" -Ddeploy.branch="8.x-build" && phpunit tests/phpunit --group=deploy
   skip_cleanup: true
   on:
     branch: 8.x

diff --git a/phing/tasks/deploy.xml b/phing/tasks/deploy.xml
@@ -19,6 +19,12 @@
                     promptCharacter=":"
                     defaultValue="${branch.current}-build"/>
 
+    <if>
+      <isset property="deploy.branch"/>
+      <then>
+        <property name="deploy.tag.create" value="n" />
+      </then>
+    </if>
     <if>
       <isset property="deploy.tag"/>
       <then>

diff --git a/scripts/travis/.travis.yml b/scripts/travis/.travis.yml
@@ -82,3 +82,9 @@ deploy:
      on:
        branch: master
        php: 5.6
+   - provider: script
+     script: blt deploy -Ddeploy.commitMsg="Automated commit by Travis CI for Build ${TRAVIS_TAG}" -Ddeploy.tag="${TRAVIS_TAG}"
+     skip_cleanup: true
+     on:
+       tags: true
+       php: 5.6