From fed20a97faca7867baec2af674b3626fc5ac3538 Mon Sep 17 00:00:00 2001 From: FireBall1725 Date: Sun, 28 Sep 2014 14:53:36 -0400 Subject: [PATCH 1/3] added fix for main branch being built with the pull requests --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 2a9f6fdb..cdd5211c 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,11 @@ archivesBaseName = config.archivesBaseName // If TeamCity is running this build, lets set the version info if (hasProperty("teamcity")) { version = teamcity["build.number"] + + // Fix for main branch being built + if (teamcity.build.branch.is_default) { + version = version.replaceAll("/", "-") + } } // Add Coremod Manifest From 31434c13824347ad96627de3bdf7f1ff79ea88a2 Mon Sep 17 00:00:00 2001 From: FireBall1725 Date: Sun, 28 Sep 2014 14:55:55 -0400 Subject: [PATCH 2/3] fixed bug in call to teamcity --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cdd5211c..eead570c 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ if (hasProperty("teamcity")) { version = teamcity["build.number"] // Fix for main branch being built - if (teamcity.build.branch.is_default) { + if (teamcity["teamcity.build.branch.is_default"]) { version = version.replaceAll("/", "-") } } From 383de1f8944b555e0e3d395ca2ff37e9c2213204 Mon Sep 17 00:00:00 2001 From: FireBall1725 Date: Sun, 28 Sep 2014 14:58:20 -0400 Subject: [PATCH 3/3] removed if statement that wasn't needed --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index eead570c..c984bfd7 100644 --- a/build.gradle +++ b/build.gradle @@ -41,9 +41,7 @@ if (hasProperty("teamcity")) { version = teamcity["build.number"] // Fix for main branch being built - if (teamcity["teamcity.build.branch.is_default"]) { - version = version.replaceAll("/", "-") - } + version = version.replaceAll("/", "-") } // Add Coremod Manifest