Upgrade infra to 0.1.0-dev-53

Author: Abduqodiri Qurbonzoda

.teamcity/additionalConfiguration.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-2020 JetBrains s.r.o.
+ * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
+ */
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.Project
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.GradleBuildStep
+
+fun Project.additionalConfiguration() {
+    platforms.forEach { platform ->
+        val gradleBuild = knownBuilds.buildOn(platform).steps.items.single() as GradleBuildStep
+        gradleBuild.tasks += " " + fastBenchmarkTasks(platform)
+    }
+}
+
+fun fastBenchmarkTasks(platform: Platform): String {
+    return listOf(
+        "js", "jvm", platform.nativeTaskPrefix()
+    ).joinToString(separator = " ", transform = { "${it}FastBenchmark" })
+}

.teamcity/settings.kts

@@ -1,6 +1,6 @@
-import jetbrains.buildServer.configs.kotlin.v2018_2.*
-import jetbrains.buildServer.configs.kotlin.v2018_2.buildSteps.*
-import jetbrains.buildServer.configs.kotlin.v2018_2.triggers.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.*
 
 /*
 The settings script is an entry point for defining a TeamCity
@@ -24,55 +24,72 @@ To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
 'Debug' option is available in the context menu for the task.
 */
 
-version = "2018.2"
-val versionSuffixParameter = "versionSuffix"
-val teamcitySuffixParameter = "teamcitySuffix"
-val releaseVersionParameter = "releaseVersion"
-
-val bintrayUserName = "orangy"
-val bintrayToken = "credentialsJSON:9a48193c-d16d-46c7-8751-2fb434b09e07"
-
-val platforms = listOf("Windows", "Linux", "Mac OS X")
-val jdk = "JDK_18_x64"
+version = "2020.1"
 
 project {
     // Disable editing of project and build settings from the UI to avoid issues with TeamCity
     params {
         param("teamcity.ui.settings.readOnly", "true")
     }
 
-    val buildAll = buildAll()
-    val builds = platforms.map { build(it) }
+    val buildVersion = buildVersion()
+    val buildAll = buildAll(buildVersion)
+    val builds = platforms.map { build(it, buildVersion) }
     builds.forEach { build ->
-        buildAll.dependsOn(build) {
-            snapshot {
-                onDependencyFailure = FailureAction.ADD_PROBLEM
-                onDependencyCancel = FailureAction.CANCEL
-            }
-        }
+        buildAll.dependsOnSnapshot(build, onFailure = FailureAction.ADD_PROBLEM)
         buildAll.dependsOn(build) {
             artifacts {
                 artifactRules = "+:maven=>maven\n+:api=>api"
             }
         }
     }
 
-    val deployConfigure = deployConfigure()
-    val deploys = platforms.map { deploy(it, deployConfigure) }
-    val deployPublish = deployPublish(deployConfigure).apply {
+    val deployVersion = deployVersion().apply {
+        dependsOnSnapshot(buildAll, onFailure = FailureAction.IGNORE)
+    }
+    val deploys = platforms.map { deploy(it, deployVersion) }
+    val deployPublish = deployPublish(deployVersion).apply {
+        dependsOnSnapshot(buildAll, onFailure = FailureAction.IGNORE)
         deploys.forEach {
             dependsOnSnapshot(it)
         }
     }
 
-    buildTypesOrder = listOf(buildAll) + builds + deployPublish + deployConfigure + deploys
+    buildTypesOrder = listOf(buildAll, buildVersion, *builds.toTypedArray(), deployPublish, deployVersion, *deploys.toTypedArray())
+
+    additionalConfiguration()
 }
 
-fun Project.buildAll() = BuildType {
-    id("Build_All")
+fun Project.buildVersion() = BuildType {
+    id(BUILD_CONFIGURE_VERSION_ID)
+    this.name = "Build (Configure Version)"
+    commonConfigure()
+
+    params {
+        param(versionSuffixParameter, "SNAPSHOT")
+        param(teamcitySuffixParameter, "%build.counter%")
+    }
+
+    steps {
+        gradle {
+            name = "Generate build chain version"
+            jdkHome = "%env.$jdk%"
+            tasks = ""
+            gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$teamcitySuffixParameter=%$teamcitySuffixParameter%"
+            buildFile = ""
+            gradleWrapperPath = ""
+        }
+    }
+}.also { buildType(it) }
+
+fun Project.buildAll(versionBuild: BuildType) = BuildType {
+    id(BUILD_ALL_ID)
     this.name = "Build (All)"
     type = BuildTypeSettings.Type.COMPOSITE
-    
+
+    dependsOnSnapshot(versionBuild)
+    buildNumberPattern = versionBuild.depParamRefs.buildNumber.ref
+
     triggers {
         vcs {
             triggerRules = """
@@ -81,19 +98,27 @@ fun Project.buildAll() = BuildType {
                 """.trimIndent()
         }
     }
-    
+
     commonConfigure()
 }.also { buildType(it) }
 
-fun Project.build(platform: String) = platform(platform, "Build") {
+fun Project.build(platform: Platform, versionBuild: BuildType) = buildType("Build", platform) {
+
+    dependsOnSnapshot(versionBuild)
+
+    params {
+        param(versionSuffixParameter, versionBuild.depParamRefs[versionSuffixParameter].ref)
+        param(teamcitySuffixParameter, versionBuild.depParamRefs[teamcitySuffixParameter].ref)
+    }
+
     steps {
         gradle {
-            name = "Build and Test $platform Binaries"
+            name = "Build and Test ${platform.buildTypeName()} Binaries"
             jdkHome = "%env.$jdk%"
             jvmArgs = "-Xmx1g"
-            tasks = "clean publishToBuildLocal check ${fastBenchmarkTasks(platform).joinToString(separator = " ")}"
+            tasks = "clean publishToBuildLocal check"
             // --continue is needed to run tests for all targets even if one target fails
-            gradleParams = "--info --stacktrace -P$versionSuffixParameter=SNAPSHOT -P$teamcitySuffixParameter=%build.counter% --continue"
+            gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$teamcitySuffixParameter=%$teamcitySuffixParameter% --continue"
             buildFile = ""
             gradleWrapperPath = ""
         }
@@ -103,34 +128,9 @@ fun Project.build(platform: String) = platform(platform, "Build") {
     artifactRules = "+:build/maven=>maven\n+:build/api=>api"
 }
 
-fun fastBenchmarkTasks(platform: String): List<String> {
-    val nativeFastBenchmark = when(platform) {
-        "Mac OS X" -> "macosX64FastBenchmark"
-        "Linux" -> "linuxX64FastBenchmark"
-        "Windows" -> "mingwX64FastBenchmark"
-        else -> throw IllegalArgumentException("Unknown platform: $platform")
-    }
-    return listOf("jsFastBenchmark", "jvmFastBenchmark", nativeFastBenchmark)
-}
-
-fun BuildType.dependsOn(build: BuildType, configure: Dependency.() -> Unit) =
-    apply {
-        dependencies.dependency(build, configure)
-    }
-
-fun BuildType.dependsOnSnapshot(build: BuildType, configure: SnapshotDependency.() -> Unit = {}) = apply {
-    dependencies.dependency(build) {
-        snapshot {
-            configure()
-            onDependencyFailure = FailureAction.FAIL_TO_START
-            onDependencyCancel = FailureAction.CANCEL
-        }
-    }
-}
-
-fun Project.deployConfigure() = BuildType {
-    id("Deploy_Configure")
-    this.name = "Deploy (Configure)"
+fun Project.deployVersion() = BuildType {
+    id(DEPLOY_CONFIGURE_VERSION_ID)
+    this.name = "Deploy (Configure Version)"
     commonConfigure()
 
     params {
@@ -158,21 +158,21 @@ fun Project.deployConfigure() = BuildType {
 }.also { buildType(it) }
 
 fun Project.deployPublish(configureBuild: BuildType) = BuildType {
-    id("Deploy_Publish")
+    id(DEPLOY_PUBLISH_ID)
     this.name = "Deploy (Publish)"
     type = BuildTypeSettings.Type.COMPOSITE
+    dependsOnSnapshot(configureBuild)
+    buildNumberPattern = configureBuild.depParamRefs.buildNumber.ref
     params {
-        param(versionSuffixParameter, "${configureBuild.depParamRefs[versionSuffixParameter]}")
-
         // Tell configuration build how to get release version parameter from this build
         // "dev" is the default and means publishing is not releasing to public
-        param(configureBuild.reverseDepParamRefs[releaseVersionParameter].name, "dev")
+        text(configureBuild.reverseDepParamRefs[releaseVersionParameter].name, "dev", display = ParameterDisplay.PROMPT, label = "Release Version")
     }
     commonConfigure()
-}.also { buildType(it) }.dependsOnSnapshot(configureBuild)
+}.also { buildType(it) }
 
 
-fun Project.deploy(platform: String, configureBuild: BuildType) = platform(platform, "Deploy") {
+fun Project.deploy(platform: Platform, configureBuild: BuildType) = buildType("Deploy", platform) {
     type = BuildTypeSettings.Type.DEPLOYMENT
     enablePersonalBuilds = false
     maxRunningBuilds = 1
@@ -189,63 +189,13 @@ fun Project.deploy(platform: String, configureBuild: BuildType) = platform(platf
 
     steps {
         gradle {
-            name = "Deploy $platform Binaries"
+            name = "Deploy ${platform.buildTypeName()} Binaries"
             jdkHome = "%env.$jdk%"
             jvmArgs = "-Xmx1g"
             gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
-            tasks = "clean build publish"
+            tasks = "clean publish"
             buildFile = ""
             gradleWrapperPath = ""
         }
     }
 }.dependsOnSnapshot(configureBuild)
-
-fun Project.platform(platform: String, name: String, configure: BuildType.() -> Unit) = BuildType {
-    // ID is prepended with Project ID, so don't repeat it here
-    // ID should conform to identifier rules, so just letters, numbers and underscore
-    id("${name}_${platform.substringBefore(" ")}")
-    // Display name of the build configuration
-    this.name = "$name ($platform)"
-
-    requirements {
-        contains("teamcity.agent.jvm.os.name", platform)
-    }
-
-    params {
-        // This parameter is needed for macOS agent to be compatible
-        param("env.JDK_17", "")
-    }
-
-    commonConfigure()
-    configure()
-}.also { buildType(it) }
-
-
-fun BuildType.commonConfigure() {
-    requirements {
-        noLessThan("teamcity.agent.hardware.memorySizeMb", "6144")
-    }
-
-    // Allow to fetch build status through API for badges
-    allowExternalStatus = true
-
-    // Configure VCS, by default use the same and only VCS root from which this configuration is fetched
-    vcs {
-        root(DslContext.settingsRoot)
-        showDependenciesChanges = true
-        checkoutMode = CheckoutMode.ON_AGENT
-    }
-
-    failureConditions {
-        errorMessage = true
-        nonZeroExitCode = true
-        executionTimeoutMin = 120
-    }
-
-    features {
-        feature {
-            id = "perfmon"
-            type = "perfmon"
-        }
-    }
-}