updated build script

translationexchange · Dec 10, 2015 · 5591235 · 5591235
1 parent c8c1ac7
commit 5591235
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/bin/deploy b/bin/deploy
@@ -35,15 +35,11 @@ end
 
 puts "\nBuilding tml-php #{version}..."
 
-if ARGV.include?('release')
-  execute('git checkout master')
-  execute('git merge develop')
-  execute('git push')
-end
-
 execute('phpunit')
 
 if ARGV.include?('release')
+  execute('git checkout master')
+  execute('git merge develop')
   execute("git tag #{version}")
   execute('git push')