From a24dd3c8ee91d7d2173f60fa8af876d636997b6d Mon Sep 17 00:00:00 2001 From: Marc Hermans Date: Sat, 15 Jan 2022 18:45:09 +0100 Subject: [PATCH] Remove primary branches from building on secondary branch configuration and publish crowdin data. (#8397) * Remove the normalized branch names also from the filter. * Add the additional publishing arguments to get the crowdin information. * TeamCity change in 'MinecraftForge / MinecraftForge' project: project parameters were changed * Fix the configuration. * Remove the required patch and use the base script. * Make a note about the reference. Co-authored-by: cpw --- .teamcity/settings.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index dd49bb115f..3d88756dd0 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -46,6 +46,8 @@ project { text("env.PUBLISHED_JAVA_FML_ARTIFACT_ID", "fmlonly", label = "Published fmlonly artifact id", description = "The maven coordinate artifact id for fml only that has been published by this build. Can not be empty.", allowEmpty = false) text("env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION", "0.0.0-SNAPSHOT", label = "Published fmlonly artifact version", description = "The version for fml only that has been published by this build. Can not be empty.", allowEmpty = false) text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false) + password("env.CROWDIN_KEY", "credentialsJSON:dfdc0764-ae34-4ce2-972b-6e9ce730cbd2", display = ParameterDisplay.HIDDEN, readOnly = true) //This is a reference and not actually a key. + text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true) checkbox("should_execute_build", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN, checked = "true", unchecked = "false") @@ -97,6 +99,11 @@ object BuildSecondaryBranches : BuildType({ -:refs/heads/main* -:refs/heads/master* -:refs/heads/1.* + -:(develop|release|staging|main|master) + -:%git_main_branch% + -:main* + -:master* + -:1.* """.trimIndent() } })