Merge pull request #100 from wick-ed/1.1

Minor bugfix with the handling of tags on travis

Author: wick-ed

CHANGELOG.md

@@ -1,3 +1,13 @@
+# Version 1.1.12
+
+## Bugfixes
+
+* None
+
+## Features
+
+* Travis-CI Debian 9 builds introduced
+
 # Version 1.1.11
 
 ## Bugfixes

buildfiles/linux/build.xml

@@ -177,13 +177,13 @@
         <antcall target="pecl-build-ev"/>
         <antcall target="pecl-build-event"/>
         <antcall target="pecl-build-xdebug"/>
-        
+
         <!-- copy runtime files from src directory -->
         <antcall target="copy-buildfiles"/>
 
         <!-- install composer into the runtime -->
         <antcall target="install-composer" />
-    	
+
     </target>
 
     <!-- ==================================================================== -->
@@ -441,9 +441,14 @@
         // declare the package name
         var packageName = '';
 
-        // first we load the branch to extract the tag we're working on
-        gitBranch = project.getProperty("env.GIT_BRANCH");
-        gitTag = gitBranch.substring(gitBranch.lastIndexOf("/") + 1);
+        // if we do not have a proper tag provided (travis would do that for us), we load the branch to extract the tag we're working on manually
+        travisTag = project.getProperty("env.TRAVIS_TAG");
+        if (travisTag) {
+            gitTag = travisTag;
+        } else {
+            gitBranch = project.getProperty("env.GIT_BRANCH");
+            gitTag = gitBranch.substring(gitBranch.lastIndexOf("/") + 1);
+        }
 
         // declare version and version suffix
         var resultVersion = gitTag;
@@ -459,7 +464,7 @@
         var versionSeparator = attributes.get("version-separator");
         var distributionSeparator = attributes.get("distribution-separator");
         var architectureSeparator = attributes.get("architecture-separator");
-        
+
         // the package name ALWAYS starts with the prefix
         packageName = prefix;
 
@@ -511,7 +516,7 @@
     <!-- ==================================================================== -->
     <target name="prepare-package-name" description="Prepares the build property package.name">
         <!-- create the distribution specific package name -->
-        <create-package-name 
+        <create-package-name
             prefix="appserver-runtime"
             build="${build.number}"
             suffix-separator="${dist.package.suffix-separator}"

buildfiles/mac/build.xml

@@ -557,9 +557,14 @@
         // declare the package name
         var packageName = '';
 
-        // first we load the branch to extract the tag we're working on
-        gitBranch = project.getProperty("env.GIT_BRANCH");
-        gitTag = gitBranch.substring(gitBranch.lastIndexOf("/") + 1);
+        // if we do not have a proper tag provided (travis would do that for us), we load the branch to extract the tag we're working on manually
+        travisTag = project.getProperty("env.TRAVIS_TAG");
+        if (travisTag) {
+            gitTag = travisTag;
+        } else {
+            gitBranch = project.getProperty("env.GIT_BRANCH");
+            gitTag = gitBranch.substring(gitBranch.lastIndexOf("/") + 1);
+        }
 
         // declare version and version suffix
         var resultVersion = gitTag;

buildfiles/win/build.xml

@@ -285,9 +285,14 @@
         // declare the package name
         var packageName = '';
 
-        // first we load the branch to extract the tag we're working on
-        gitBranch = project.getProperty("env.GIT_BRANCH");
-        gitTag = gitBranch.substring(gitBranch.lastIndexOf("/") + 1);
+        // if we do not have a proper tag provided (travis would do that for us), we load the branch to extract the tag we're working on manually
+        travisTag = project.getProperty("env.TRAVIS_TAG");
+        if (travisTag) {
+            gitTag = travisTag;
+        } else {
+            gitBranch = project.getProperty("env.GIT_BRANCH");
+            gitTag = gitBranch.substring(gitBranch.lastIndexOf("/") + 1);
+        }
 
         // declare version and version suffix
         var resultVersion = gitTag;