diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9801f30f..9a16a9e0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,11 +7,6 @@ on: - synchronize - labeled - unlabeled - push: - branches: - - "version/*" - - "release/*" - - "testing/*" workflow_dispatch: permissions: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 913d9a0e..16f0b4c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,7 @@ on: - "version/*" - "release/*" - "testing/*" + workflow_dispatch: permissions: contents: write diff --git a/.teamcity/patches/buildTypes/Beta_Release.kts b/.teamcity/patches/buildTypes/Beta_Release.kts deleted file mode 100644 index 181425d2..00000000 --- a/.teamcity/patches/buildTypes/Beta_Release.kts +++ /dev/null @@ -1,25 +0,0 @@ -package patches.buildTypes - -import jetbrains.buildServer.configs.kotlin.v2019_2.* -import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.ScheduleTrigger -import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule -import jetbrains.buildServer.configs.kotlin.v2019_2.ui.* - -/* -This patch script was generated by TeamCity on settings change in UI. -To apply the patch, change the buildType with id = 'Beta_Release' -accordingly, and delete the patch script. -*/ -changeBuildType(RelativeId("Beta_Release")) { - triggers { - add { - schedule { - id = "TRIGGER_15" - schedulingPolicy = weekly { - dayOfWeek = ScheduleTrigger.DAY.Saturday - } - triggerBuild = always() - } - } - } -} diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml deleted file mode 100644 index 6c42e6de..00000000 --- a/.teamcity/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - LetSDevTogether_DomumOrnamentum Config DSL Script - LetSDevTogether_DomumOrnamentum - LetSDevTogether_DomumOrnamentum_dsl - 1.0-SNAPSHOT - - - org.jetbrains.teamcity - configs-dsl-kotlin-parent - 1.0-SNAPSHOT - - - - - jetbrains-all - https://download.jetbrains.com/teamcity-repository - - true - - - - teamcity-server - https://buildsystem.ldtteam.com/app/dsl-plugins-repository - - true - - - - - - - JetBrains - https://download.jetbrains.com/teamcity-repository - - - - - ${basedir} - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - - - compile - process-sources - - compile - - - - test-compile - process-test-sources - - test-compile - - - - - - org.jetbrains.teamcity - teamcity-configs-maven-plugin - ${teamcity.dsl.version} - - kotlin - target/generated-configs - - - - - - - - org.jetbrains.teamcity - configs-dsl-kotlin - ${teamcity.dsl.version} - compile - - - org.jetbrains.teamcity - configs-dsl-kotlin-plugins - 1.0-SNAPSHOT - pom - compile - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - compile - - - org.jetbrains.kotlin - kotlin-script-runtime - ${kotlin.version} - compile - - - \ No newline at end of file diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts deleted file mode 100644 index e66b70dd..00000000 --- a/.teamcity/settings.kts +++ /dev/null @@ -1,270 +0,0 @@ -import jetbrains.buildServer.configs.kotlin.v2019_2.* -import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues - -/* -The settings script is an entry point for defining a TeamCity -project hierarchy. The script should contain a single call to the -project() function with a Project instance or an init function as -an argument. - -VcsRoots, BuildTypes, Templates, and subprojects can be -registered inside the project using the vcsRoot(), buildType(), -template(), and subProject() methods respectively. - -To debug settings scripts in command-line, run the - - mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate - -command and attach your debugger to the port 8000. - -To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View --> Tool Windows -> Maven Projects), find the generate task node -(Plugins -> teamcity-configs -> teamcity-configs:generate), the -'Debug' option is available in the context menu for the task. -*/ - -version = "2023.05" - -project { - description = "All the blocks for all the Materials" - - params { - password("env.crowdinKey", "credentialsJSON:444bd785-791b-42ae-9fae-10ee93a2fbd3") - select("Current Minecraft Version", "latest", label = "Current Minecraft Version", - options = listOf("1.12", "1.13", "1.14", "1.15", "1.16", "1.17")) - text("Repository", "ldtteam/Domum-Ornamentum", label = "Repository", description = "The repository for Domum Ornamentum.", readOnly = true, allowEmpty = true) - param("env.Version.Minor", "0") - param("env.Version.Patch", "0") - param("Upsource.Project.Id", "domum-ornamentum") - param("env.Version.Suffix", "") - param("env.Version.Major", "1") - text("env.Version", "%env.Version.Major%.%env.Version.Minor%.%env.Version.Patch%%env.Version.Suffix%", label = "Version", description = "The version of the project.", display = ParameterDisplay.HIDDEN, allowEmpty = true) - } - - features { - githubIssues { - id = "PROJECT_EXT_35" - displayName = "ldtteam/domum-ornamentum" - repositoryURL = "https://github.com/ldtteam/Domum-Ornamentum" - authType = accessToken { - accessToken = "credentialsJSON:47381468-aceb-4992-93c9-1ccd4d7aa67f" - } - } - } - subProjectsOrder = arrayListOf(RelativeId("Release"), RelativeId("UpgradeBetaRelease"), RelativeId("Beta"), RelativeId("OfficialPublications"), RelativeId("Branches"), RelativeId("PullRequests2")) - - subProject(Release) - subProject(Beta) - subProject(UpgradeBetaRelease) - subProject(PullRequests2) - subProject(Branches) - subProject(OfficialPublications) -} - - -object Beta : Project({ - name = "Beta" - description = "Beta version builds of domum ornamentum" - - buildType(Beta_Release) - - params { - param("Default.Branch", "version/%Current Minecraft Version%") - param("VCS.Branches", "+:refs/heads/version/(*)") - param("env.CURSERELEASETYPE", "beta") - param("env.Version.Suffix", "-BETA") - } -}) - -object Beta_Release : BuildType({ - templates(AbsoluteId("LetSDevTogether_BuildWithRelease")) - name = "Release" - description = "Releases the mod as Beta to CurseForge" - - params { - param("Project.Type", "mods") - param("env.Version.Patch", "${OfficialPublications_CommonB.depParamRefs.buildNumber}") - } - - vcs { - branchFilter = "+:*" - } - - dependencies { - snapshot(OfficialPublications_CommonB) { - reuseBuilds = ReuseBuilds.NO - onDependencyFailure = FailureAction.FAIL_TO_START - } - } -}) - - -object Branches : Project({ - name = "Branches" - description = "All none release branches." - - buildType(Branches_Common) - buildType(Branches_Build) - - params { - text("Default.Branch", "CI/Default", label = "Default branch", description = "The default branch for branch builds", readOnly = true, allowEmpty = true) - param("VCS.Branches", """ - +:refs/heads/(*) - -:refs/heads/version/* - -:refs/heads/release/* - -:refs/pull/*/head - -:refs/heads/CI/* - """.trimIndent()) - param("env.Version.Suffix", "-PERSONAL") - } - - cleanup { - baseRule { - all(days = 60) - } - } -}) - -object Branches_Build : BuildType({ - templates(AbsoluteId("LetSDevTogether_Build")) - name = "Build" - description = "Builds the branch without testing." - - params { - param("Project.Type", "mods") - param("env.Version.Patch", "${Branches_Common.depParamRefs.buildNumber}") - } - - dependencies { - snapshot(Branches_Common) { - reuseBuilds = ReuseBuilds.NO - onDependencyFailure = FailureAction.FAIL_TO_START - } - } -}) - -object Branches_Common : BuildType({ - templates(AbsoluteId("LetSDevTogether_CommonBuildCounter")) - name = "Common Build Counter" - description = "Tracks the amount of builds run for branches" -}) - - -object OfficialPublications : Project({ - name = "Official Publications" - description = "Holds projects and builds related to official publications" - - buildType(OfficialPublications_CommonB) -}) - -object OfficialPublications_CommonB : BuildType({ - templates(AbsoluteId("LetSDevTogether_CommonBuildCounter")) - name = "Common Build Counter" - description = "Represents the version counter within Domum Ornamentum for official releases." -}) - - -object PullRequests2 : Project({ - name = "Pull Requests" - description = "All open pull requests" - - buildType(PullRequests2_BuildAndTest) - buildType(PullRequests2_CommonBuildCounter) - - params { - text("Default.Branch", "CI/Default", label = "Default branch", description = "The default branch for pull requests.", readOnly = true, allowEmpty = false) - param("VCS.Branches", """ - -:refs/heads/* - +:refs/pull/(*)/head - -:refs/heads/(CI/*) - """.trimIndent()) - text("env.Version", "%env.Version.Major%.%env.Version.Minor%.%build.counter%-PR", label = "Version", description = "The version of the project.", display = ParameterDisplay.HIDDEN, allowEmpty = true) - } - - cleanup { - baseRule { - all(days = 60) - } - } -}) - -object PullRequests2_BuildAndTest : BuildType({ - templates(AbsoluteId("LetSDevTogether_BuildWithTesting")) - name = "Build and Test" - description = "Builds and Tests the pull request." - - params { - param("Project.Type", "mods") - param("env.Version.Patch", "${PullRequests2_CommonBuildCounter.depParamRefs.buildNumber}") - param("env.Version.Suffix", "-PR") - } - - dependencies { - snapshot(PullRequests2_CommonBuildCounter) { - reuseBuilds = ReuseBuilds.NO - onDependencyFailure = FailureAction.FAIL_TO_START - } - } - - disableSettings("BUILD_EXT_15") -}) - -object PullRequests2_CommonBuildCounter : BuildType({ - templates(AbsoluteId("LetSDevTogether_CommonBuildCounter")) - name = "Common Build Counter" - description = "Defines version numbers uniquely over all Pull Request builds" -}) - - -object Release : Project({ - name = "Release" - description = "Beta version builds of domum ornamentum" - - buildType(Release_Release) - - params { - param("Default.Branch", "release/%Current Minecraft Version%") - param("VCS.Branches", "+:refs/heads/release/(*)") - param("env.CURSERELEASETYPE", "release") - param("env.Version.Suffix", "-RELEASE") - } -}) - -object Release_Release : BuildType({ - templates(AbsoluteId("LetSDevTogether_BuildWithRelease")) - name = "Release" - description = "Releases the mod as Release to CurseForge" - - params { - param("Project.Type", "mods") - param("env.Version.Patch", "${OfficialPublications_CommonB.depParamRefs.buildNumber}") - } - - dependencies { - snapshot(OfficialPublications_CommonB) { - reuseBuilds = ReuseBuilds.NO - onDependencyFailure = FailureAction.FAIL_TO_START - } - } -}) - -object UpgradeBetaRelease : Project({ - name = "Upgrade Beta -> Release" - description = "Upgrades the current Beta to Release" - - buildType(UpgradeBetaRelease_UpgradeBetaRelease) -}) - -object UpgradeBetaRelease_UpgradeBetaRelease : BuildType({ - templates(AbsoluteId("LetSDevTogether_Upgrade")) - name = "Upgrade Beta -> Release" - description = "Upgrades the current Beta to Release." - - params { - text("Source.Branch", "version", label = "Source branch type", description = "The source branch type for the upgrade. EG: version", allowEmpty = false) - text("Default.Branch", "release/%Current Minecraft Version%", label = "Default branch", description = "The default branch of this build.", allowEmpty = true) - param("VCS.Branches", "+:refs/heads/release/(*)") - text("Target.Branch", "release", label = "Target branch type", description = "The target branch type for the upgrade. EG: release.", allowEmpty = false) - text("env.Version", "%env.Version.Major%.%env.Version.Minor%.%build.counter%-RELEASE", label = "Version", description = "The version of the project.", display = ParameterDisplay.HIDDEN, allowEmpty = true) - } -}) diff --git a/gradle.properties b/gradle.properties index 84a8a196..e76699fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,12 @@ org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true modGroup=com.ldtteam -modVersion=1.0.0-RELEASE +modVersion=1.0.0 modId=domum_ornamentum -modBaseName=domum-ornamentum forgeVersion=21.1.4 minecraftVersion=1.21.1 @@ -19,14 +21,11 @@ librarySourceSets=api;main;datagen; dataGeneratorsVersion=1.20.4-0.1.57-ALPHA usesDatagen=true -isFMLLibrary=false -shadowRenamedNamespaces= - -githubUrl= -gitUrl= -gitConnectUrl= -projectUrl= +githubUrl=https://github.com/ldtteam/Domum-Ornamentum +gitUrl=https://github.com/ldtteam/Domum-Ornamentum.git +gitConnectUrl=https://github.com/ldtteam/Domum-Ornamentum.git +projectUrl=https://github.com/ldtteam/Domum-Ornamentum curseId=527361 usesCurse=true @@ -38,7 +37,4 @@ usesParchment=true parchmentMinecraftVersion=1.21 parchmentMappingsVersion=2024.07.28 -usesCrowdInTranslationManagement=false -usesCrowdInBuildingWithFilteredBranches=false -usesCrowdInUploadWithFilteredBranches=false usesResourceDataExpansionFromProjectKeys=false