diff options
| -rw-r--r-- | .circleci/config.yml | 8 | ||||
| -rw-r--r-- | build.gradle | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 2be7471253..7bfee9a42d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,11 +43,15 @@ jobs: # Build Mod - run: name: Download Build Script - command: wget https://alkcorp.overminddl1.com/GTPP_BuildScript.sh + command: wget https://alkcorp.overminddl1.com/Build_1_Master.sh + + - run: + name: Run Master Script + command: sh Build_1_Master.sh ${CIRCLE_BUILD_NUM} "${CIRCLE_BRANCH}" "${CIRCLE_USERNAME}" "${CIRCLE_SHA1}" "${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_PROJECT_USERNAME}" "https://github.com/draknyte1/GTplusplus/archive/master.zip" - run: name: Run Build Script - command: sh GTPP_BuildScript.sh ${CIRCLE_BUILD_NUM} "${CIRCLE_BRANCH}" "${CIRCLE_USERNAME}" "${CIRCLE_SHA1}" "${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_PROJECT_USERNAME}" "https://github.com/draknyte1/GTplusplus/archive/master.zip" + command: sh RunScript.sh - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/ path: build/libs diff --git a/build.gradle b/build.gradle index 110cab2a54..240e931d2f 100644 --- a/build.gradle +++ b/build.gradle @@ -56,10 +56,15 @@ file "build.properties" withReader { ext.config = new ConfigSlurper().parse prop } +file "version.properties" withReader { + def prop = new Properties() + prop.load(it) + ext.config2 = new ConfigSlurper().parse prop +} apply plugin: 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' -version = "${config.gtpp.version}" +version = "${config.gtpp.version}.${config2.mod.version}" group= "gtPlusPlus" archivesBaseName = "GT-PlusPlus" |