3
0
Mirror von https://github.com/ViaVersion/ViaBackwards.git synchronisiert 2024-07-10 09:18:04 +02:00

[ci skip] Fix branch check in publishing

Dieser Commit ist enthalten in:
Nassim Jahnke 2023-09-26 00:24:36 +10:00
Ursprung c6711919b1
Commit 1d35b1cdb2
2 geänderte Dateien mit 65 neuen und 63 gelöschten Zeilen

Datei anzeigen

@ -50,7 +50,7 @@ fun Project.latestCommitMessage(): String {
fun Project.branchName(): String { fun Project.branchName(): String {
val byteOut = ByteArrayOutputStream() val byteOut = ByteArrayOutputStream()
exec { exec {
commandLine = listOf("git", "branch") commandLine = listOf("git", "symbolic-ref", "--short", "HEAD")
standardOutput = byteOut standardOutput = byteOut
} }
return byteOut.toString(Charsets.UTF_8.name()).trim() return byteOut.toString(Charsets.UTF_8.name()).trim()

Datei anzeigen

@ -46,6 +46,8 @@ publishShadowJar()
val branch = rootProject.branchName() val branch = rootProject.branchName()
val baseVersion = project.version as String val baseVersion = project.version as String
val isRelease = !baseVersion.contains('-') val isRelease = !baseVersion.contains('-')
val isMainBranch = branch == "master"
if (!isRelease || isMainBranch) { // Only publish releases from the main branch
val suffixedVersion = if (isRelease) baseVersion else baseVersion + "+" + System.getenv("GITHUB_RUN_NUMBER") val suffixedVersion = if (isRelease) baseVersion else baseVersion + "+" + System.getenv("GITHUB_RUN_NUMBER")
val changelogContent = if (isRelease) { val changelogContent = if (isRelease) {
"See [GitHub](https://github.com/ViaVersion/ViaBackwards) for release notes." "See [GitHub](https://github.com/ViaVersion/ViaBackwards) for release notes."
@ -53,7 +55,6 @@ val changelogContent = if (isRelease) {
val commitHash = rootProject.latestCommitHash() val commitHash = rootProject.latestCommitHash()
"[$commitHash](https://github.com/ViaVersion/ViaBackwards/commit/$commitHash) ${rootProject.latestCommitMessage()}" "[$commitHash](https://github.com/ViaVersion/ViaBackwards/commit/$commitHash) ${rootProject.latestCommitMessage()}"
} }
val isMainBranch = branch == "master"
modrinth { modrinth {
// val snapshotVersion = rootProject.parseMinecraftSnapshotVersion(project.version as String) // val snapshotVersion = rootProject.parseMinecraftSnapshotVersion(project.version as String)
val mcVersions: List<String> = (property("mcVersions") as String) val mcVersions: List<String> = (property("mcVersions") as String)
@ -122,3 +123,4 @@ hangarPublish {
} }
} }
} }
}