From 3e70892e800de3eb705ea6746352dc29b86f33f5 Mon Sep 17 00:00:00 2001
From: Filipp Riabchun <filipp.riabchun@jetbrains.com>
Date: Sun, 16 Feb 2020 01:25:16 +0100
Subject: [PATCH] Apply patches

---
 .teamcity/patches/buildTypes/Examples2.kts | 14 --------
 .teamcity/patches/templates/Common.kts     | 40 ----------------------
 .teamcity/settings.kts                     | 14 +++++++-
 3 files changed, 13 insertions(+), 55 deletions(-)
 delete mode 100644 .teamcity/patches/buildTypes/Examples2.kts
 delete mode 100644 .teamcity/patches/templates/Common.kts

diff --git a/.teamcity/patches/buildTypes/Examples2.kts b/.teamcity/patches/buildTypes/Examples2.kts
deleted file mode 100644
index 3124abdba13..00000000000
--- a/.teamcity/patches/buildTypes/Examples2.kts
+++ /dev/null
@@ -1,14 +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 = 'Examples2'
-accordingly, and delete the patch script.
-*/
-changeBuildType(RelativeId("Examples2")) {
-    expectDisabledSettings()
-    updateDisabledSettings("swabra")
-}
diff --git a/.teamcity/patches/templates/Common.kts b/.teamcity/patches/templates/Common.kts
deleted file mode 100644
index a7f53a77dd7..00000000000
--- a/.teamcity/patches/templates/Common.kts
+++ /dev/null
@@ -1,40 +0,0 @@
-package patches.templates
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.Swabra
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.swabra
-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 template with id = 'Common'
-accordingly, and delete the patch script.
-*/
-changeTemplate(RelativeId("Common")) {
-    features {
-        val feature1 = find<Swabra> {
-            swabra {
-                id = "swabra"
-                verbose = true
-                paths = "-:**/node_modules/**"
-            }
-        }
-        feature1.apply {
-            paths = """
-                -:node_modules
-                -:**/node_modules
-            """.trimIndent()
-        }
-        add {
-            pullRequests {
-                id = "BUILD_EXT_2"
-                provider = github {
-                    authType = vcsRoot()
-                    filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
-                }
-            }
-        }
-    }
-}
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
index d3384ca8e71..e1ff71c3c6d 100644
--- a/.teamcity/settings.kts
+++ b/.teamcity/settings.kts
@@ -1,5 +1,7 @@
 import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.swabra
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
@@ -99,7 +101,17 @@ object Common: Template({
         swabra {
             id = "swabra"
             verbose = true
-            paths = "-:**/node_modules/**"
+            paths = """
+                -:node_modules
+                -:**/node_modules
+            """.trimIndent()
+        }
+        pullRequests {
+            id = "BUILD_EXT_2"
+            provider = github {
+                authType = vcsRoot()
+                filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
+            }
         }
     }
 })