Merge release into master (gradle#27566)

bodhili · Jan 2, 2024 · 2435264 · 2435264
2 parents a7b9749 + 9fc347b
commit 2435264
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.teamcity/src/main/kotlin/configurations/GitHubMergeQueueCheckPass.kt b/.teamcity/src/main/kotlin/configurations/GitHubMergeQueueCheckPass.kt
@@ -11,8 +11,7 @@ import model.CIBuildModel
 import model.StageName
 
 class GitHubMergeQueueCheckPass(model: CIBuildModel) : BaseGradleBuildType(init = {
-    uuid = "Check_GitHubMergeQueueCheckPass"
-    id(uuid)
+    id("Check_GitHubMergeQueueCheckPass")
     name = "GitHub Merge Queue Check Pass"
     type = Type.COMPOSITE
 

diff --git a/.teamcity/src/test/kotlin/CIConfigIntegrationTests.kt b/.teamcity/src/test/kotlin/CIConfigIntegrationTests.kt
@@ -3,6 +3,7 @@ import common.JvmVersion
 import common.Os
 import common.VersionedSettingsBranch
 import configurations.BaseGradleBuildType
+import configurations.GitHubMergeQueueCheckPass
 import jetbrains.buildServer.configs.kotlin.DslContext
 import jetbrains.buildServer.configs.kotlin.buildSteps.GradleBuildStep
 import jetbrains.buildServer.configs.kotlin.failureConditions.BuildFailureOnText
@@ -41,12 +42,12 @@ class CIConfigIntegrationTests {
     @Test
     fun configurationTreeCanBeGenerated() {
         assertEquals(rootProject.subProjects.size, model.stages.size)
-        assertEquals(rootProject.buildTypes.size, model.stages.size)
+        assertEquals(rootProject.buildTypes.size, model.stages.size + 1) // +1 for the GitHubMergeQueueCheckPass
     }
 
     @Test
     fun configurationsHaveDependencies() {
-        val stagePassConfigs = rootProject.buildTypes
+        val stagePassConfigs = rootProject.buildTypes.filter { it !is GitHubMergeQueueCheckPass }
         assertEquals(model.stages.size, stagePassConfigs.size)
         stagePassConfigs.forEach {
             val stageNumber = stagePassConfigs.indexOf(it) + 1

diff --git a/released-versions.json b/released-versions.json
@@ -1,7 +1,7 @@
 {
   "latestReleaseSnapshot": {
-    "version": "8.6-20231229011415+0000",
-    "buildTime": "20231229011415+0000"
+    "version": "8.6-20240102084408+0000",
+    "buildTime": "20240102084408+0000"
   },
   "latestRc": {
     "version": "8.6-rc-1",