From edcc8b3c97d366ba0b090bc0bca89f2d78171131 Mon Sep 17 00:00:00 2001
From: cpw <cpw+github@weeksfamily.ca>
Date: Sat, 15 Jan 2022 14:21:01 -0500
Subject: [PATCH] fix secondary branches builds

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
---
 ...MinecraftForge__BuildSecondaryBranches.kts | 45 -------------------
 .teamcity/settings.kts                        | 20 ++++-----
 2 files changed, 8 insertions(+), 57 deletions(-)
 delete mode 100644 .teamcity/patches/buildTypes/MinecraftForge_MinecraftForge__BuildSecondaryBranches.kts

diff --git a/.teamcity/patches/buildTypes/MinecraftForge_MinecraftForge__BuildSecondaryBranches.kts b/.teamcity/patches/buildTypes/MinecraftForge_MinecraftForge__BuildSecondaryBranches.kts
deleted file mode 100644
index 6bf35e6546..0000000000
--- a/.teamcity/patches/buildTypes/MinecraftForge_MinecraftForge__BuildSecondaryBranches.kts
+++ /dev/null
@@ -1,45 +0,0 @@
-package patches.buildTypes
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-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 = 'MinecraftForge_MinecraftForge__BuildSecondaryBranches'
-accordingly, and delete the patch script.
-*/
-changeBuildType(RelativeId("MinecraftForge_MinecraftForge__BuildSecondaryBranches")) {
-    params {
-        add {
-            param("git_branch_spec", """
-                +:refs/heads/(*)
-                -:refs/heads/noci*
-            """.trimIndent())
-        }
-    }
-
-    vcs {
-
-        check(branchFilter == """
-            +:*             
-            -:refs/heads/(develop|release|staging|main|master)
-            -:<default>
-            -:refs/heads/%git_main_branch%
-            -:refs/heads/main*
-            -:refs/heads/master*
-            -:refs/heads/1.*
-            -:(develop|release|staging|main|master)
-            -:%git_main_branch%
-            -:main*
-            -:master*
-            -:1.*            
-        """.trimIndent()) {
-            "Unexpected option value: branchFilter = $branchFilter"
-        }
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-}
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
index 3d88756dd0..dee1a04fab 100644
--- a/.teamcity/settings.kts
+++ b/.teamcity/settings.kts
@@ -89,21 +89,17 @@ object BuildSecondaryBranches : BuildType({
     id("MinecraftForge_MinecraftForge__BuildSecondaryBranches")
     name = "Build - Secondary Branches"
     description = "Builds and Publishes the secondary branches of the project."
-
+    params {
+        text("git_branch_spec", """
+                +:refs/heads/(*)
+                -:refs/heads/noci*
+            """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
+    }
     vcs {
         branchFilter = """
-            +:*             
-            -:refs/heads/(develop|release|staging|main|master)
+            +:*
+            -:1.*
             -:<default>
-            -:refs/heads/%git_main_branch%
-            -:refs/heads/main*
-            -:refs/heads/master*
-            -:refs/heads/1.*
-            -:(develop|release|staging|main|master)
-            -:%git_main_branch%
-            -:main*
-            -:master*
-            -:1.*            
         """.trimIndent()
     }
 })