Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

fixed some stuff in automate builds

Browse Source
This commit is contained in:
Giovanni Harting
2016-07-21 18:03:19 +02:00
parent d46ca78bd5
commit a3f53b1593
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -71,7 +71,7 @@ sourceSets {
} }
task buildInfo { task buildInfo {
def cmd = "git name-rev --tags --name-only \$(git rev-parse HEAD)" def cmd = "git describe --tags \$(git rev-list --tags --max-count=1)"
def proc = cmd.execute() def proc = cmd.execute()
proc.waitFor() proc.waitFor()
if (proc.exitValue() == 0) { if (proc.exitValue() == 0) {
@@ -84,7 +84,7 @@ task buildInfo {
project.ext.mc_version = project.minecraft.version.split('-')[0] project.ext.mc_version = project.minecraft.version.split('-')[0]
def cmd_changes = "git log `git describe --tags \$(git rev-list --tags --max-count=2) | sed -n '2p'`..`git describe --tags --abbrev=0` --oneline" def cmd_changes = "git log \$(git describe --tags --abbrev=0)..\$(git describe --tags \$(git rev-list --tags --max-count=1)) --oneline"
def proc_changes = cmd_changes.execute() def proc_changes = cmd_changes.execute()
proc_changes.waitFor() proc_changes.waitFor()
if (proc_changes.exitValue() == 0) { if (proc_changes.exitValue() == 0) {
@@ -95,7 +95,7 @@ task buildInfo {
} }
version = tag ? "${mc_version}-${tag}" : "${mc_version}-snapshot" version = project.tag ? "${mc_version}-${project.tag}" : "${mc_version}-snapshot"
//noinspection GroovyAssignabilityCheck //noinspection GroovyAssignabilityCheck
processResources { processResources {
@@ -134,7 +134,7 @@ curseforge {
releaseType = 'release' releaseType = 'release'
mainArtifact(jar) { mainArtifact(jar) {
displayName = "taiga-$project.tag" displayName = "taiga-${project.tag}"
} }
} }
} }