Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
1 change: 0 additions & 1 deletion buildSrc/src/main/kotlin/common-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ tasks {
withType<Test> {
withProp("excludeTests") { exclude(it) }

ignoreFailures = true
filter {
isFailOnNoMatchingTests = false
}
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/intellijUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
}
}
Original file line number Diff line number Diff line change
@@ -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)
}
}
Original file line number Diff line number Diff line change
@@ -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)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading