From d394cba53a2f7a6269003e412092514bc2a48202 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 3 Sep 2021 12:51:09 +0200 Subject: [PATCH 01/43] Update branch3 --- branch3 | 1 + 1 file changed, 1 insertion(+) diff --git a/branch3 b/branch3 index 05f80bb..9821042 100644 --- a/branch3 +++ b/branch3 @@ -1,2 +1,3 @@ test branch3 еуые +main From 56edbaecc9c28de738184a65905a2a2cbe1f62dd Mon Sep 17 00:00:00 2001 From: kilina0 Date: Mon, 20 Sep 2021 17:03:57 +0200 Subject: [PATCH 02/43] Create test pr --- test pr | 1 + 1 file changed, 1 insertion(+) create mode 100644 test pr diff --git a/test pr b/test pr new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/test pr @@ -0,0 +1 @@ +test From 120eda673d1316a4b65b259cc4fe729e4221811a Mon Sep 17 00:00:00 2001 From: teamcity-admin Date: Mon, 25 Apr 2022 17:05:15 +0000 Subject: [PATCH 03/43] TeamCity change in 'CLoud front' project: Versioned settings configuration updated --- .teamcity/pom.xml | 104 +++++++++++++++++++++++++++++++++++++++++ .teamcity/settings.kts | 85 +++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+) create mode 100644 .teamcity/pom.xml create mode 100644 .teamcity/settings.kts diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml new file mode 100644 index 0000000..165586c --- /dev/null +++ b/.teamcity/pom.xml @@ -0,0 +1,104 @@ + + + 4.0.0 + CLoudFront Config DSL Script + CLoudFront + CLoudFront_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 + http://10.128.93.89:8111/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-latest + ${teamcity.dsl.version} + compile + + + org.jetbrains.teamcity + configs-dsl-kotlin-plugins-latest + 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 new file mode 100644 index 0000000..0e1e936 --- /dev/null +++ b/.teamcity/settings.kts @@ -0,0 +1,85 @@ +import jetbrains.buildServer.configs.kotlin.* +import jetbrains.buildServer.configs.kotlin.buildFeatures.investigationsAutoAssigner +import jetbrains.buildServer.configs.kotlin.projectFeatures.activeStorage +import jetbrains.buildServer.configs.kotlin.projectFeatures.s3Storage +import jetbrains.buildServer.configs.kotlin.triggers.vcs + +/* +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 = "2022.04" + +project { + + buildType(Build) + + features { + s3Storage { + id = "PROJECT_EXT_139" + bucketName = "kilina-bucket2-private" + bucketPrefix = "25apr" + cloudFrontEnabled = true + cloudFrontUploadDistribution = "E41EEYSGLZNSV" + cloudFrontDownloadDistribution = "E41EEYSGLZNSV" + cloudFrontPublicKeyId = "K26BUJLPKKPL16" + cloudFrontPrivateKey = "credentialsJSON:3fd6888d-e40e-48fd-b39a-4b60954ad0ca" + accessKey = "credentialsJSON:087ba199-e5e9-4bc8-a011-1d47370f2a07" + awsEnvironment = default { + awsRegionName = "us-east-2" + } + accessKeyID = "AKIA5JH2VERVMSFJ2JGO" + } + activeStorage { + id = "PROJECT_EXT_140" + activeStorageID = "PROJECT_EXT_139" + } + } +} + +object Build : BuildType({ + name = "Build" + + artifactRules = """ + test => test + README.md + """.trimIndent() + + vcs { + root(DslContext.settingsRoot) + } + + triggers { + vcs { + } + } + + features { + investigationsAutoAssigner { + defaultAssignee = "test" + excludeUsers = """ + ksenia + admin + """.trimIndent() + ignoreCompilationProblems = "true" + } + } +}) From a9a6bf888611cd7b07c45bb646512a08086949fa Mon Sep 17 00:00:00 2001 From: kilina0 Date: Mon, 25 Apr 2022 19:06:32 +0200 Subject: [PATCH 04/43] Update settings.kts --- .teamcity/settings.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index 0e1e936..2d69429 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -36,7 +36,7 @@ project { s3Storage { id = "PROJECT_EXT_139" bucketName = "kilina-bucket2-private" - bucketPrefix = "25apr" + bucketPrefix = "25apr-1" cloudFrontEnabled = true cloudFrontUploadDistribution = "E41EEYSGLZNSV" cloudFrontDownloadDistribution = "E41EEYSGLZNSV" @@ -78,6 +78,7 @@ object Build : BuildType({ excludeUsers = """ ksenia admin + user """.trimIndent() ignoreCompilationProblems = "true" } From 67cf995d85fd0be4b1ca8e3b67055ae7588d26ac Mon Sep 17 00:00:00 2001 From: kilina0 Date: Mon, 25 Apr 2022 19:10:28 +0200 Subject: [PATCH 05/43] Delete settings.kts --- .teamcity/settings.kts | 86 ------------------------------------------ 1 file changed, 86 deletions(-) delete mode 100644 .teamcity/settings.kts diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts deleted file mode 100644 index 2d69429..0000000 --- a/.teamcity/settings.kts +++ /dev/null @@ -1,86 +0,0 @@ -import jetbrains.buildServer.configs.kotlin.* -import jetbrains.buildServer.configs.kotlin.buildFeatures.investigationsAutoAssigner -import jetbrains.buildServer.configs.kotlin.projectFeatures.activeStorage -import jetbrains.buildServer.configs.kotlin.projectFeatures.s3Storage -import jetbrains.buildServer.configs.kotlin.triggers.vcs - -/* -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 = "2022.04" - -project { - - buildType(Build) - - features { - s3Storage { - id = "PROJECT_EXT_139" - bucketName = "kilina-bucket2-private" - bucketPrefix = "25apr-1" - cloudFrontEnabled = true - cloudFrontUploadDistribution = "E41EEYSGLZNSV" - cloudFrontDownloadDistribution = "E41EEYSGLZNSV" - cloudFrontPublicKeyId = "K26BUJLPKKPL16" - cloudFrontPrivateKey = "credentialsJSON:3fd6888d-e40e-48fd-b39a-4b60954ad0ca" - accessKey = "credentialsJSON:087ba199-e5e9-4bc8-a011-1d47370f2a07" - awsEnvironment = default { - awsRegionName = "us-east-2" - } - accessKeyID = "AKIA5JH2VERVMSFJ2JGO" - } - activeStorage { - id = "PROJECT_EXT_140" - activeStorageID = "PROJECT_EXT_139" - } - } -} - -object Build : BuildType({ - name = "Build" - - artifactRules = """ - test => test - README.md - """.trimIndent() - - vcs { - root(DslContext.settingsRoot) - } - - triggers { - vcs { - } - } - - features { - investigationsAutoAssigner { - defaultAssignee = "test" - excludeUsers = """ - ksenia - admin - user - """.trimIndent() - ignoreCompilationProblems = "true" - } - } -}) From 03d063fb7391b1805382521a79ccb9717ecc8ad4 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Mon, 25 Apr 2022 19:10:33 +0200 Subject: [PATCH 06/43] Delete pom.xml --- .teamcity/pom.xml | 104 ---------------------------------------------- 1 file changed, 104 deletions(-) delete mode 100644 .teamcity/pom.xml diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml deleted file mode 100644 index 165586c..0000000 --- a/.teamcity/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - CLoudFront Config DSL Script - CLoudFront - CLoudFront_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 - http://10.128.93.89:8111/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-latest - ${teamcity.dsl.version} - compile - - - org.jetbrains.teamcity - configs-dsl-kotlin-plugins-latest - 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 From 1d4c25e0fa115a552de8cc3eec654189e45b5023 Mon Sep 17 00:00:00 2001 From: teamcity-admin Date: Mon, 25 Apr 2022 17:10:56 +0000 Subject: [PATCH 07/43] TeamCity change in 'CLoud front' project: Synchronization with own VCS root is enabled --- .../buildTypes/CLoudFront_Build.xml | 38 +++++++++++++++ .teamcity/CLoudFront/project-config.xml | 46 +++++++++++++++++++ ...ComKilina0testBranchesRefsHeadsDevelop.xml | 18 ++++++++ 3 files changed, 102 insertions(+) create mode 100644 .teamcity/CLoudFront/buildTypes/CLoudFront_Build.xml create mode 100644 .teamcity/CLoudFront/project-config.xml create mode 100644 .teamcity/CLoudFront/vcsRoots/CLoudFront_HttpsGithubComKilina0testBranchesRefsHeadsDevelop.xml diff --git a/.teamcity/CLoudFront/buildTypes/CLoudFront_Build.xml b/.teamcity/CLoudFront/buildTypes/CLoudFront_Build.xml new file mode 100644 index 0000000..f18b1c5 --- /dev/null +++ b/.teamcity/CLoudFront/buildTypes/CLoudFront_Build.xml @@ -0,0 +1,38 @@ + + + Build + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.teamcity/CLoudFront/project-config.xml b/.teamcity/CLoudFront/project-config.xml new file mode 100644 index 0000000..50d3482 --- /dev/null +++ b/.teamcity/CLoudFront/project-config.xml @@ -0,0 +1,46 @@ + + + CLoud front + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.teamcity/CLoudFront/vcsRoots/CLoudFront_HttpsGithubComKilina0testBranchesRefsHeadsDevelop.xml b/.teamcity/CLoudFront/vcsRoots/CLoudFront_HttpsGithubComKilina0testBranchesRefsHeadsDevelop.xml new file mode 100644 index 0000000..cefdbcc --- /dev/null +++ b/.teamcity/CLoudFront/vcsRoots/CLoudFront_HttpsGithubComKilina0testBranchesRefsHeadsDevelop.xml @@ -0,0 +1,18 @@ + + + https://github.com/kilina0/test_branches#refs/heads/develop + + + + + + + + + + + + + + + From 22c556072fed48714914afd0f0684ec559247a48 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Mon, 25 Apr 2022 19:13:19 +0200 Subject: [PATCH 08/43] Update project-config.xml --- .teamcity/CLoudFront/project-config.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.teamcity/CLoudFront/project-config.xml b/.teamcity/CLoudFront/project-config.xml index 50d3482..7e9813c 100644 --- a/.teamcity/CLoudFront/project-config.xml +++ b/.teamcity/CLoudFront/project-config.xml @@ -23,7 +23,6 @@ - From 95a1adae5b8c36c86e0eca8496e200893df3b671 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Mon, 25 Apr 2022 19:18:29 +0200 Subject: [PATCH 09/43] Delete project-config.xml --- .teamcity/CLoudFront/project-config.xml | 45 ------------------------- 1 file changed, 45 deletions(-) delete mode 100644 .teamcity/CLoudFront/project-config.xml diff --git a/.teamcity/CLoudFront/project-config.xml b/.teamcity/CLoudFront/project-config.xml deleted file mode 100644 index 7e9813c..0000000 --- a/.teamcity/CLoudFront/project-config.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - CLoud front - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 65b777d70b63e02fb160f3f795071bdbdc9711f5 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Mon, 25 Apr 2022 19:18:37 +0200 Subject: [PATCH 10/43] Delete CLoudFront_HttpsGithubComKilina0testBranchesRefsHeadsDevelop.xml --- ...bComKilina0testBranchesRefsHeadsDevelop.xml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .teamcity/CLoudFront/vcsRoots/CLoudFront_HttpsGithubComKilina0testBranchesRefsHeadsDevelop.xml diff --git a/.teamcity/CLoudFront/vcsRoots/CLoudFront_HttpsGithubComKilina0testBranchesRefsHeadsDevelop.xml b/.teamcity/CLoudFront/vcsRoots/CLoudFront_HttpsGithubComKilina0testBranchesRefsHeadsDevelop.xml deleted file mode 100644 index cefdbcc..0000000 --- a/.teamcity/CLoudFront/vcsRoots/CLoudFront_HttpsGithubComKilina0testBranchesRefsHeadsDevelop.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - https://github.com/kilina0/test_branches#refs/heads/develop - - - - - - - - - - - - - - - From 2ab13cc9b6a3ae9cd4fbff8d1d858eedf2a2a14b Mon Sep 17 00:00:00 2001 From: kilina0 Date: Mon, 25 Apr 2022 19:18:44 +0200 Subject: [PATCH 11/43] Delete CLoudFront_Build.xml --- .../buildTypes/CLoudFront_Build.xml | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 .teamcity/CLoudFront/buildTypes/CLoudFront_Build.xml diff --git a/.teamcity/CLoudFront/buildTypes/CLoudFront_Build.xml b/.teamcity/CLoudFront/buildTypes/CLoudFront_Build.xml deleted file mode 100644 index f18b1c5..0000000 --- a/.teamcity/CLoudFront/buildTypes/CLoudFront_Build.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - Build - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 1ff67d14dab45a4de718985fb067bedce2d2a1f0 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Mon, 2 May 2022 18:41:24 +0200 Subject: [PATCH 12/43] Update test pr --- test pr | 1 + 1 file changed, 1 insertion(+) diff --git a/test pr b/test pr index 9daeafb..dec2cbe 100644 --- a/test pr +++ b/test pr @@ -1 +1,2 @@ test +test From 2f5ca090b02e33af123e66a4cbd221fb668fec06 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 17 Jun 2022 12:11:48 +0200 Subject: [PATCH 13/43] Update test pr --- test pr | 1 + 1 file changed, 1 insertion(+) diff --git a/test pr b/test pr index dec2cbe..812920a 100644 --- a/test pr +++ b/test pr @@ -1,2 +1,3 @@ test test +test3 From 54565dc49479663c536220629bcc649970f0bd22 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 17 Jun 2022 12:36:39 +0200 Subject: [PATCH 14/43] Update test pr --- test pr | 1 + 1 file changed, 1 insertion(+) diff --git a/test pr b/test pr index 812920a..420b11a 100644 --- a/test pr +++ b/test pr @@ -1,3 +1,4 @@ test test test3 +test4 From 8afc97c93b8cc77c732a330c4b877d1b25d70fb0 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 17 Jun 2022 12:56:17 +0200 Subject: [PATCH 15/43] Update test pr --- test pr | 1 + 1 file changed, 1 insertion(+) diff --git a/test pr b/test pr index 420b11a..1c78fd0 100644 --- a/test pr +++ b/test pr @@ -2,3 +2,4 @@ test test test3 test4 +test5 From faa8f641d7479d7f7a39032fb81a37fefea8b337 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 15:21:43 +0100 Subject: [PATCH 16/43] Update text.txt --- test/text.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/text.txt b/test/text.txt index 7556f68..9677df4 100644 --- a/test/text.txt +++ b/test/text.txt @@ -2,3 +2,4 @@ blbalbslblablabla test test еуые2 +авава From 8c922a836cef065e286ac3ec093776a19ff9b51d Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 15:24:06 +0100 Subject: [PATCH 17/43] Update text.txt --- test/text.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/text.txt b/test/text.txt index 9677df4..17c772a 100644 --- a/test/text.txt +++ b/test/text.txt @@ -3,3 +3,4 @@ test test еуые2 авава +draft-pull-request From 8de7d4257c3ffb3d06808a240b5a5c6fc6ff0163 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 15:25:42 +0100 Subject: [PATCH 18/43] Update branch3 --- branch3 | 1 + 1 file changed, 1 insertion(+) diff --git a/branch3 b/branch3 index 9821042..847950b 100644 --- a/branch3 +++ b/branch3 @@ -1,3 +1,4 @@ test branch3 еуые main +hjy From 6227b74673e433b9c434bf077bbc97f6021110a8 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 17:26:46 +0100 Subject: [PATCH 19/43] Create test-file --- test-file | 1 + 1 file changed, 1 insertion(+) create mode 100644 test-file diff --git a/test-file b/test-file new file mode 100644 index 0000000..fe31447 --- /dev/null +++ b/test-file @@ -0,0 +1 @@ +fdfd From 2f699088a06c93aa66c9673c9c29f69a03ee92a4 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 17:29:48 +0100 Subject: [PATCH 20/43] Update branch3 --- branch3 | 1 + 1 file changed, 1 insertion(+) diff --git a/branch3 b/branch3 index 847950b..5c071cb 100644 --- a/branch3 +++ b/branch3 @@ -2,3 +2,4 @@ test branch3 еуые main hjy +gfgf From b0980bf33391957d963ce16d26624cdeca131ca5 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 17:30:19 +0100 Subject: [PATCH 21/43] Update test pr --- test pr | 1 + 1 file changed, 1 insertion(+) diff --git a/test pr b/test pr index 1c78fd0..2237d41 100644 --- a/test pr +++ b/test pr @@ -3,3 +3,4 @@ test test3 test4 test5 +test6 From d63429bbdce305d1016bb14700f2c4d08e77c4e5 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 17:31:18 +0100 Subject: [PATCH 22/43] Update test-file --- test-file | 1 + 1 file changed, 1 insertion(+) diff --git a/test-file b/test-file index fe31447..1aea09e 100644 --- a/test-file +++ b/test-file @@ -1 +1,2 @@ fdfd +cxcx From 048c2953d56ac5f5c2a7f7fca27da800ea8145b2 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 2 Dec 2022 17:35:01 +0100 Subject: [PATCH 23/43] TeamCity change in 'Test Branches' project: Versioned settings configuration updated --- .teamcity/pom.xml | 104 +++++++++++++++++++++++++++++++++++++++++ .teamcity/settings.kts | 60 ++++++++++++++++++++++++ 2 files changed, 164 insertions(+) create mode 100644 .teamcity/pom.xml create mode 100644 .teamcity/settings.kts diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml new file mode 100644 index 0000000..ab9b924 --- /dev/null +++ b/.teamcity/pom.xml @@ -0,0 +1,104 @@ + + + 4.0.0 + TestBranches Config DSL Script + TestBranches + TestBranches_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 + http://localhost:8111/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-latest + ${teamcity.dsl.version} + compile + + + org.jetbrains.teamcity + configs-dsl-kotlin-plugins-latest + 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 new file mode 100644 index 0000000..f8ed88c --- /dev/null +++ b/.teamcity/settings.kts @@ -0,0 +1,60 @@ +import jetbrains.buildServer.configs.kotlin.* +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +import jetbrains.buildServer.configs.kotlin.buildFeatures.perfmon +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +import jetbrains.buildServer.configs.kotlin.triggers.vcs + +/* +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 = "2022.10" + +project { + + buildType(Build) +} + +object Build : BuildType({ + name = "Build" + + vcs { + root(DslContext.settingsRoot) + } + + triggers { + vcs { + } + } + + features { + perfmon { + } + pullRequests { + provider = github { + authType = token { + token = "credentialsJSON:1115db9a-8bdd-49bf-8292-662b58db5728" + } + filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER + } + } + } +}) From ac438c33acc080bf9dcd15eb088c90a6568d0259 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 17:37:43 +0100 Subject: [PATCH 24/43] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7be3cc6..4bb2d8a 100644 --- a/README.md +++ b/README.md @@ -33,3 +33,4 @@ dsdsd dskhkj dkjhkjdhk asj hdkas dsfdf test +test From 90adbf3de95e5e266e6b62d74381d8da37049491 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 2 Dec 2022 19:41:49 +0100 Subject: [PATCH 25/43] TeamCity change in 'Test Branches' project: build features of 'Build' build configuration were updated --- .teamcity/settings.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index f8ed88c..b324597 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -54,6 +54,7 @@ object Build : BuildType({ token = "credentialsJSON:1115db9a-8bdd-49bf-8292-662b58db5728" } filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER + ignoreDrafts = true } } } From e4757ccc0c81fd45276742dc60ea8ba7b1690461 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 19:46:39 +0100 Subject: [PATCH 26/43] Update text.txt --- test/text.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/text.txt b/test/text.txt index 17c772a..a8af5b7 100644 --- a/test/text.txt +++ b/test/text.txt @@ -4,3 +4,4 @@ test еуые2 авава draft-pull-request +dsdsd From 80afa4777d399604fccb6dec9e7939a7cb553d55 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 19:55:25 +0100 Subject: [PATCH 27/43] Update settings.kts --- .teamcity/settings.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index b324597..6e27370 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -54,7 +54,7 @@ object Build : BuildType({ token = "credentialsJSON:1115db9a-8bdd-49bf-8292-662b58db5728" } filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER - ignoreDrafts = true + ignoreDrafts = false } } } From edad5c7754c5ddcdb704086c8efa52e7d6529bc6 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 19:57:35 +0100 Subject: [PATCH 28/43] Create file4 --- file4 | 1 + 1 file changed, 1 insertion(+) create mode 100644 file4 diff --git a/file4 b/file4 new file mode 100644 index 0000000..16b14f5 --- /dev/null +++ b/file4 @@ -0,0 +1 @@ +test file From d6c4cf30e1ff6e19e3b722a0b7ed84b4466002ff Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 20:01:21 +0100 Subject: [PATCH 29/43] Update file4 --- file4 | 1 + 1 file changed, 1 insertion(+) diff --git a/file4 b/file4 index 16b14f5..d5b301a 100644 --- a/file4 +++ b/file4 @@ -1 +1,2 @@ test file +thest2 From 7e2c94b4e49912ff70a9616e21e5a7b1d5f525cc Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 2 Dec 2022 20:03:12 +0100 Subject: [PATCH 30/43] TeamCity change in 'Test Branches' project: build features of 'Build' build configuration were updated --- .teamcity/settings.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index 6e27370..b324597 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -54,7 +54,7 @@ object Build : BuildType({ token = "credentialsJSON:1115db9a-8bdd-49bf-8292-662b58db5728" } filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER - ignoreDrafts = false + ignoreDrafts = true } } } From 8f7746c2bfe817b04c9326b75b6f648a05bb2725 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 20:03:17 +0100 Subject: [PATCH 31/43] Update text.txt --- test/text.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/text.txt b/test/text.txt index a8af5b7..7e52c49 100644 --- a/test/text.txt +++ b/test/text.txt @@ -5,3 +5,4 @@ test авава draft-pull-request dsdsd +fdfd From 0b097e26db327573b63ca3ccca0a86b3510af0e0 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 20:49:12 +0100 Subject: [PATCH 32/43] Update file4 --- file4 | 1 + 1 file changed, 1 insertion(+) diff --git a/file4 b/file4 index d5b301a..4755865 100644 --- a/file4 +++ b/file4 @@ -1,2 +1,3 @@ test file thest2 +hkj From 3811e24539c4a6b4f69aa72cf6dcaab45d2ff832 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 20:57:19 +0100 Subject: [PATCH 33/43] Update file4 --- file4 | 1 + 1 file changed, 1 insertion(+) diff --git a/file4 b/file4 index 4755865..d7cb10a 100644 --- a/file4 +++ b/file4 @@ -1,3 +1,4 @@ test file thest2 hkj +ytu uy uy From 34572d22ed63becc5d0cb250a8ed0b10b5d76dad Mon Sep 17 00:00:00 2001 From: kilina0 Date: Fri, 2 Dec 2022 21:15:36 +0100 Subject: [PATCH 34/43] Update file4 --- file4 | 1 + 1 file changed, 1 insertion(+) diff --git a/file4 b/file4 index d7cb10a..c69ac4d 100644 --- a/file4 +++ b/file4 @@ -2,3 +2,4 @@ test file thest2 hkj ytu uy uy +kljkjl From d217d2048388ec12e071add10900f74576d79b9e Mon Sep 17 00:00:00 2001 From: kilina0 Date: Tue, 13 Dec 2022 17:33:26 +0100 Subject: [PATCH 35/43] Update test pr --- test pr | 1 + 1 file changed, 1 insertion(+) diff --git a/test pr b/test pr index 2237d41..aed2326 100644 --- a/test pr +++ b/test pr @@ -4,3 +4,4 @@ test3 test4 test5 test6 +test7 From d85512175d956ed211971e59c98940a8400e2793 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Tue, 13 Dec 2022 17:33:58 +0100 Subject: [PATCH 36/43] Update file4 --- file4 | 1 + 1 file changed, 1 insertion(+) diff --git a/file4 b/file4 index c69ac4d..ffd18e4 100644 --- a/file4 +++ b/file4 @@ -3,3 +3,4 @@ thest2 hkj ytu uy uy kljkjl +file test From 879dd3d092a2c20a354f23fcd17af0368914fb73 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Tue, 7 Feb 2023 13:37:58 +0100 Subject: [PATCH 37/43] Update branch3 --- branch3 | 1 + 1 file changed, 1 insertion(+) diff --git a/branch3 b/branch3 index 5c071cb..47d51a5 100644 --- a/branch3 +++ b/branch3 @@ -3,3 +3,4 @@ test branch3 main hjy gfgf +khkjhj From 97641eb52aa6584ccb309130e1c58b328af002ea Mon Sep 17 00:00:00 2001 From: kilina0 Date: Thu, 6 Apr 2023 17:29:06 +0200 Subject: [PATCH 38/43] Update file4 --- file4 | 1 + 1 file changed, 1 insertion(+) diff --git a/file4 b/file4 index ffd18e4..0825db3 100644 --- a/file4 +++ b/file4 @@ -4,3 +4,4 @@ hkj ytu uy uy kljkjl file test +test From 19cd197a27a6c12a72639f8a840abcf07e9c5996 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Thu, 6 Apr 2023 17:29:20 +0200 Subject: [PATCH 39/43] Update test pr --- test pr | 1 + 1 file changed, 1 insertion(+) diff --git a/test pr b/test pr index aed2326..7754e4a 100644 --- a/test pr +++ b/test pr @@ -5,3 +5,4 @@ test4 test5 test6 test7 +test8 From ddb2422f346ad10f8cafc63215980b07d1622102 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Thu, 6 Apr 2023 17:35:50 +0200 Subject: [PATCH 40/43] Update test pr --- test pr | 1 + 1 file changed, 1 insertion(+) diff --git a/test pr b/test pr index 7754e4a..0542fb9 100644 --- a/test pr +++ b/test pr @@ -6,3 +6,4 @@ test5 test6 test7 test8 +test9 From 4fba37edf099a8b55ac8d35a66cf68ce2966a0db Mon Sep 17 00:00:00 2001 From: kilina0 Date: Thu, 6 Apr 2023 17:36:06 +0200 Subject: [PATCH 41/43] Update test-file --- test-file | 1 + 1 file changed, 1 insertion(+) diff --git a/test-file b/test-file index 1aea09e..dcdfa1d 100644 --- a/test-file +++ b/test-file @@ -1,2 +1,3 @@ fdfd cxcx +cxcx From b81b9a0eef8a2cd1fee1a2979bb60cc8e6fb44c5 Mon Sep 17 00:00:00 2001 From: kilina0 Date: Thu, 6 Apr 2023 17:46:55 +0200 Subject: [PATCH 42/43] Update file4 --- file4 | 1 + 1 file changed, 1 insertion(+) diff --git a/file4 b/file4 index 0825db3..d275f16 100644 --- a/file4 +++ b/file4 @@ -5,3 +5,4 @@ ytu uy uy kljkjl file test test +kjhkj From 299f6ead8aa97c576a6b4fb80594a00025943c9d Mon Sep 17 00:00:00 2001 From: kilina0 Date: Thu, 6 Apr 2023 17:47:09 +0200 Subject: [PATCH 43/43] Update test pr --- test pr | 1 + 1 file changed, 1 insertion(+) diff --git a/test pr b/test pr index 0542fb9..ae837fc 100644 --- a/test pr +++ b/test pr @@ -7,3 +7,4 @@ test6 test7 test8 test9 +test10