testing timeout changes and fewer versions to verify

HaxeFoundation · Jul 24, 2024 · 83f74a0 · 83f74a0
1 parent 66f1c95
commit 83f74a0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -21,6 +21,7 @@ jobs:
         OS: [macos-13, ubuntu-latest, windows-latest]
 
     runs-on: ${{ matrix.OS }}
+    timeout-minutes: 25
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 17
@@ -53,10 +54,12 @@ jobs:
 
 
       - name: Build with Gradle (windows)
+        timeout-minutes: 20
         if: ${{ matrix.os == 'windows-latest'}}
         run: .\gradlew.bat clean test buildPlugin verifyPlugin
 
       - name: Build with Gradle (linux/mac)
+        timeout-minutes: 20
         if: ${{ matrix.os != 'windows-latest'}}
         run: ./gradlew clean test buildPlugin verifyPlugin
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,6 +6,7 @@ import org.jetbrains.grammarkit.tasks.GenerateParserTask
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.intellij.platform.gradle.models.ProductRelease
+import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
 
 fun properties(key: String) = providers.gradleProperty(key)
 fun environment(key: String) = providers.environmentVariable(key)
@@ -79,6 +80,7 @@ dependencies {
 
     intellijPlatform {
         pluginVerifier()
+        jetbrainsRuntime()
         instrumentationTools()
         create(platformType, platformVersion)
 
@@ -103,6 +105,7 @@ subprojects {
         mavenCentral()
         intellijPlatform {
             defaultRepositories()
+            jetbrainsRuntime()
             mavenCentral()
         }
     }
@@ -162,15 +165,20 @@ intellijPlatform  {
 
     }
     verifyPlugin {
-        freeArgs.set(listOf("-mute", "TemplateWordInPluginId,ForbiddenPluginIdPrefix"))
+        freeArgs = listOf("-mute", "TemplateWordInPluginId,ForbiddenPluginIdPrefix")
+        failureLevel = listOf(
+//            VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS,
+            VerifyPluginTask.FailureLevel.MISSING_DEPENDENCIES
+        )
         ides {
-            recommended()
-
-            //TODO  problem verifying 2024.2 beta, emojipicker not found ?
-//            select {
+            //TODO  problem verifying 2024.2 beta, emojipicker not found, timeout ?
+//            recommended()
+            select {
+                sinceBuild.set("240")
+                untilBuild.set("241.*")
 //                sinceBuild.set(properties("pluginSinceBuild"))
 //                untilBuild.set(properties("pluginUntilBuild"))
-//            }
+            }
         }
     }
 //    instrumentCode = false