Use unix timestamp for subversions

This commit is contained in:
Johannes Frohnmeyer 2021-11-28 17:26:25 +01:00
parent dc343ce1bf
commit 97b9307cfd
Signed by: Johannes
GPG Key ID: E76429612C2929F4
3 changed files with 12 additions and 7 deletions

View File

@ -13,7 +13,7 @@ stages:
build_test:
stage: build
script:
- gradle --build-cache build publish -PpublicMaven -Ppipeline=$CI_PIPELINE_ID
- gradle --build-cache build publish -Ppublic
- cp build/libs/* ./
- rm *-maven.jar *-sources.jar *-sources-dev.jar
- mv *-dev.jar dev.zip
@ -30,4 +30,4 @@ deploy:
- if: $CI_COMMIT_TAG && '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^master/'
stage: deploy
script:
- gradle --build-cache build publish modrinth curseforge -PpublicMaven
- gradle --build-cache build publish modrinth curseforge -Ppublic -Prelease

View File

@ -1,6 +1,8 @@
import com.modrinth.minotaur.TaskModrinthUpload
import com.modrinth.minotaur.request.VersionType
import java.time.Instant
plugins {
id "java"
id "idea"
@ -14,7 +16,7 @@ plugins {
}
def ENV = System.getenv()
ext.isPublicMaven = project.hasProperty('publicMaven')
ext.isPublicMaven = project.hasProperty('public')
// Fetch changelog
grgit.open(dir: project.projectDir.toString())
@ -39,6 +41,9 @@ def changelogStr = "Commits in " + ext.currentType.toString().toLowerCase() + "
for (def commit : grgit.log{range(tagList.get(tagList.size() - 2).fullName, currentTag.fullName)}) {
changelogStr += "\n- " + commit.shortMessage
}
if (!project.hasProperty("release")) {
ext.currentVer += "-" + Instant.now().getEpochSecond()
}
println(changelogStr)
static Node getOrCreateNode(Node node, String name) {
@ -90,7 +95,7 @@ allprojects {
}
group = "io.gitlab.jfronny.libjf"
version = "$rootProject.ext.currentVer" + (project.hasProperty('pipeline') ? "-" + project.getProperty('pipeline') : "")
version = "$rootProject.ext.currentVer"
sourceSets {
testmod {

View File

@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx1G
# https://fabricmc.net/versions.html
minecraft_version=1.18-pre4
yarn_mappings=build.9
minecraft_version=1.18-rc3
yarn_mappings=build.2
loader_version=0.12.5
fabric_version=0.42.7+1.18
fabric_version=0.43.1+1.18