diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7ea1553..ab06a83 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,7 +22,7 @@ jobs: java-version: '11' distribution: 'adopt' - name: Build with gradle - run: ./gradlew build + run: ./gradlew build -Dbranch=${{ github.ref }} - name: shadowJar with gradle run: ./gradlew shadowJar - name: Upload Bungee diff --git a/RedisBungee-API/build.gradle.kts b/RedisBungee-API/build.gradle.kts index c9103c1..3f8a97a 100644 --- a/RedisBungee-API/build.gradle.kts +++ b/RedisBungee-API/build.gradle.kts @@ -32,20 +32,31 @@ description = "RedisBungee interafaces" blossom { replaceToken("@version@", "$version") // GIT - val branchStdout = ByteArrayOutputStream() - rootProject.exec { - standardOutput = branchStdout - commandLine("git", "branch", "--show-current") + var branch: String = "" + var commit: String = "" + val branchProp = System.getProperty("branch") + if (branchProp != null) { + branch = branchProp; + } else { + val branchStdout = ByteArrayOutputStream() + rootProject.exec { + standardOutput = branchStdout + commandLine("git", "branch", "--show-current") + } + branch = branchStdout.toString().replace("\n", "") + branchStdout.close() } val commitStdout = ByteArrayOutputStream() rootProject.exec { standardOutput = commitStdout commandLine("git", "rev-parse", "HEAD") } - replaceToken("@git_branch@", "$branchStdout".replace("\n", "")) - replaceToken("@git_commit@", "$commitStdout".replace("\n", "")) - branchStdout.close() + commit = "$commitStdout".replace("\n", ""); commitStdout.close() + + replaceToken("@git_branch@", branch) + replaceToken("@git_commit@", commit) + } java {