From 4dfecb1290ec93c942ff699dc26d27805be5d233 Mon Sep 17 00:00:00 2001
From: meanmail <meanmail@meanmail.dev>
Date: Thu, 26 Mar 2026 17:32:07 +0400
Subject: [PATCH 1/3] Fix test-framework resolution and hs-Cpp compilation
 across platforms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove explicit version from testFramework() — let the plugin resolve
  it automatically from the configured platform dependency
- Extract makeCmakeExecutable() into platform-specific branches:
  252/253 use getBundledCMakeToolBinary(Boolean, ToolKind) API,
  261 uses getBundledCMakeToolBinary(ToolKind) API

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 buildSrc/src/main/kotlin/intellijUtils.kt            |  4 ++--
 .../src/org/hyperskill/academy/cpp/cmakeCompat.kt    | 12 ++++++++++++
 .../src/org/hyperskill/academy/cpp/cmakeCompat.kt    | 12 ++++++++++++
 .../src/org/hyperskill/academy/cpp/cmakeCompat.kt    | 10 ++++++++++
 .../org/hyperskill/academy/cpp/CppConstantsPool.kt   |  7 -------
 5 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 intellij-plugin/hs-Cpp/branches/252/src/org/hyperskill/academy/cpp/cmakeCompat.kt
 create mode 100644 intellij-plugin/hs-Cpp/branches/253/src/org/hyperskill/academy/cpp/cmakeCompat.kt
 create mode 100644 intellij-plugin/hs-Cpp/branches/261/src/org/hyperskill/academy/cpp/cmakeCompat.kt

diff --git a/buildSrc/src/main/kotlin/intellijUtils.kt b/buildSrc/src/main/kotlin/intellijUtils.kt
index 244462469..13fd77402 100644
--- a/buildSrc/src/main/kotlin/intellijUtils.kt
+++ b/buildSrc/src/main/kotlin/intellijUtils.kt
@@ -186,10 +186,10 @@ fun IntelliJPlatformDependenciesExtension.testIntellijPlugins(notations: List<St
 }
 
 fun IntelliJPlatformDependenciesExtension.testIntellijPlatformFramework(
-  project: Project,
+  @Suppress("unused") project: Project,
   frameworkType: TestFrameworkType = TestFrameworkType.Platform,
 ) {
-  testFramework(frameworkType, project.baseVersion.toTypeWithVersion().version)
+  testFramework(frameworkType)
 }
 
 // Since 2024.1 CLion has two sets of incompatible plugins: based on classic language engine and new one (AKA Radler).
diff --git a/intellij-plugin/hs-Cpp/branches/252/src/org/hyperskill/academy/cpp/cmakeCompat.kt b/intellij-plugin/hs-Cpp/branches/252/src/org/hyperskill/academy/cpp/cmakeCompat.kt
new file mode 100644
index 000000000..f1559e7d0
--- /dev/null
+++ b/intellij-plugin/hs-Cpp/branches/252/src/org/hyperskill/academy/cpp/cmakeCompat.kt
@@ -0,0 +1,12 @@
+package org.hyperskill.academy.cpp
+
+import com.jetbrains.cidr.cpp.toolchains.CMakeExecutableTool
+
+// BACKCOMPAT: 252. In 2025.2 getBundledCMakeToolBinary takes (Boolean, ToolKind) parameters
+internal fun makeCmakeExecutable() {
+  @Suppress("DEPRECATION")
+  val cmakeFile = CMakeExecutableTool.getBundledCMakeToolBinary(false, CMakeExecutableTool.ToolKind.CMAKE)
+  if (cmakeFile.exists() && !cmakeFile.canExecute()) {
+    cmakeFile.setExecutable(true)
+  }
+}
diff --git a/intellij-plugin/hs-Cpp/branches/253/src/org/hyperskill/academy/cpp/cmakeCompat.kt b/intellij-plugin/hs-Cpp/branches/253/src/org/hyperskill/academy/cpp/cmakeCompat.kt
new file mode 100644
index 000000000..6764573f9
--- /dev/null
+++ b/intellij-plugin/hs-Cpp/branches/253/src/org/hyperskill/academy/cpp/cmakeCompat.kt
@@ -0,0 +1,12 @@
+package org.hyperskill.academy.cpp
+
+import com.jetbrains.cidr.cpp.toolchains.CMakeExecutableTool
+
+// BACKCOMPAT: 253. In 2025.3 getBundledCMakeToolBinary takes (Boolean, ToolKind) parameters
+internal fun makeCmakeExecutable() {
+  @Suppress("DEPRECATION")
+  val cmakeFile = CMakeExecutableTool.getBundledCMakeToolBinary(false, CMakeExecutableTool.ToolKind.CMAKE)
+  if (cmakeFile.exists() && !cmakeFile.canExecute()) {
+    cmakeFile.setExecutable(true)
+  }
+}
diff --git a/intellij-plugin/hs-Cpp/branches/261/src/org/hyperskill/academy/cpp/cmakeCompat.kt b/intellij-plugin/hs-Cpp/branches/261/src/org/hyperskill/academy/cpp/cmakeCompat.kt
new file mode 100644
index 000000000..aa30c5914
--- /dev/null
+++ b/intellij-plugin/hs-Cpp/branches/261/src/org/hyperskill/academy/cpp/cmakeCompat.kt
@@ -0,0 +1,10 @@
+package org.hyperskill.academy.cpp
+
+import com.jetbrains.cidr.cpp.toolchains.CMakeExecutableTool
+
+internal fun makeCmakeExecutable() {
+  val cmakeFile = CMakeExecutableTool.getBundledCMakeToolBinary(CMakeExecutableTool.ToolKind.CMAKE)
+  if (cmakeFile.exists() && !cmakeFile.canExecute()) {
+    cmakeFile.setExecutable(true)
+  }
+}
diff --git a/intellij-plugin/hs-Cpp/src/org/hyperskill/academy/cpp/CppConstantsPool.kt b/intellij-plugin/hs-Cpp/src/org/hyperskill/academy/cpp/CppConstantsPool.kt
index e06b3fe95..a4e8ac852 100644
--- a/intellij-plugin/hs-Cpp/src/org/hyperskill/academy/cpp/CppConstantsPool.kt
+++ b/intellij-plugin/hs-Cpp/src/org/hyperskill/academy/cpp/CppConstantsPool.kt
@@ -47,13 +47,6 @@ val CMAKE_MINIMUM_REQUIRED_LINE_VALUE: String by lazy {
   }
 }
 
-private fun makeCmakeExecutable() {
-  val cmakeFile = CMakeExecutableTool.getBundledCMakeToolBinary(CMakeExecutableTool.ToolKind.CMAKE)
-  if (cmakeFile.exists() && !cmakeFile.canExecute()) {
-    cmakeFile.setExecutable(true)
-  }
-}
-
 const val CMAKE_PROJECT_NAME_KEY: String = "PROJECT_NAME"
 
 const val CMAKE_CPP_STANDARD_KEY: String = "CPP_STANDARD"

From 378fd94fc86b3305c12ce1112c8ccb2579a7f207 Mon Sep 17 00:00:00 2001
From: meanmail <meanmail@meanmail.dev>
Date: Thu, 26 Mar 2026 18:26:08 +0400
Subject: [PATCH 2/3] CI: run specific test tasks to avoid module classpath
 issues

Module tests (hs-core, hs-Java, etc.) cannot run directly because
prepareSandbox is disabled in modules, leaving IntelliJ Platform
jars off the test runtime classpath. Run :intellij-plugin:test
(which includes hs-core tests) plus standalone module tests.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 737b8f8b7..d0dfbd6cf 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -42,7 +42,7 @@ jobs:
           echo "VERSION=${BASE_VERSION}.${{ github.run_number }}" >> $GITHUB_ENV
 
       - name: Run tests
-        run: ./gradlew test -PenvironmentName=${{ matrix.environmentName }} -PpluginVersion=${{ env.VERSION }}
+        run: ./gradlew :intellij-plugin:test :hs-edu-format:test :hs-framework-storage:test -PenvironmentName=${{ matrix.environmentName }} -PpluginVersion=${{ env.VERSION }}
 
       - name: Verify plugin
         run: ./gradlew verifyPlugin -PenvironmentName=${{ matrix.environmentName }} -PpluginVersion=${{ env.VERSION }}

From f372b9097573d48897293a12ea574c9104b0cf49 Mon Sep 17 00:00:00 2001
From: meanmail <meanmail@meanmail.dev>
Date: Fri, 27 Mar 2026 10:18:33 +0400
Subject: [PATCH 3/3] Remove ignoreFailures=true so CI fails on test failures

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 buildSrc/src/main/kotlin/common-conventions.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/common-conventions.gradle.kts b/buildSrc/src/main/kotlin/common-conventions.gradle.kts
index 0e7e88814..f668325d3 100644
--- a/buildSrc/src/main/kotlin/common-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/common-conventions.gradle.kts
@@ -68,7 +68,6 @@ tasks {
   withType<Test> {
     withProp("excludeTests") { exclude(it) }
 
-    ignoreFailures = true
     filter {
       isFailOnNoMatchingTests = false
     }