try

pontem-network · Apr 7, 2024 · e88dd6d · e88dd6d
1 parent 6397dc8
commit e88dd6d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/.github/workflows/ui_check.yml b/.github/workflows/ui_check.yml
@@ -26,8 +26,8 @@ jobs:
 #            url: http://127.0.0.1:8082
 #            reportName: ui-tests-fails-report-linux
               - os: macOS-latest
-                runIde: ./gradlew :plugin:runIdeForUiTests -Pkotlin.incremental=false --no-daemon &
-                runTests: ./gradlew :ui-tests:test -Pkotlin.incremental=false --no-daemon
+                runIde: ./gradlew :plugin:runIdeForUiTests &
+                runTests: ./gradlew :ui-tests:test
                 url: http://127.0.0.1:8082
                 reportName: ui-test-fails-report-mac
     #          - os: windows-latest
@@ -75,15 +75,20 @@ jobs:
               caches/modules-2/files-2.1/com.jetbrains.intellij.idea
               caches/modules-2/files-2.1/com.jetbrains.intellij.clion      
 
-      - name: Prepare UI testing sandbox
-        uses: gradle/[email protected]
-        with:
-          gradle-version: wrapper
-          arguments: ":plugin:prepareUiTestingSandbox -Pkotlin.incremental=false --no-daemon --stacktrace"
-          gradle-home-cache-excludes: |
-            caches/modules-2/files-2.1/com.jetbrains.intellij.pycharm
-            caches/modules-2/files-2.1/com.jetbrains.intellij.idea
-            caches/modules-2/files-2.1/com.jetbrains.intellij.clion            
+#      - name: Prepare UI testing sandbox
+#        uses: gradle/[email protected]
+#        with:
+#          gradle-version: wrapper
+#          arguments: ":plugin:prepareUiTestingSandbox -Pkotlin.incremental=false --no-daemon --stacktrace"
+#          gradle-home-cache-excludes: |
+#            caches/modules-2/files-2.1/com.jetbrains.intellij.pycharm
+#            caches/modules-2/files-2.1/com.jetbrains.intellij.idea
+#            caches/modules-2/files-2.1/com.jetbrains.intellij.clion
+      - name: Clean plugin
+        run: ./gradlew :plugin:clean
+
+      - name: Clean ui-tests
+        run: ./gradlew :ui-tests:clean
 
       - name: Run Idea
         run: ${{ matrix.runIde }}
@@ -93,7 +98,7 @@ jobs:
         with:
           url: ${{ matrix.url }}
           max-attempts: 15
-          retry-delay: 10s
+          retry-delay: 30s
 
       - name: Run tests
         run: ${{ matrix.runTests }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -263,12 +263,12 @@ project(":plugin") {
 
         runIdeForUiTests {
             systemProperty("robot-server.port", "8082")
-//            systemProperty "ide.mac.message.dialogs.as.sheets", "false"
-//            systemProperty "jb.privacy.policy.text", "<!--999.999-->"
-//            systemProperty "jb.consents.confirmation.enabled", "false"
-//            systemProperty "ide.mac.file.chooser.native", "false"
-//            systemProperty "jbScreenMenuBar.enabled", "false"
-//            systemProperty "apple.laf.useScreenMenuBar", "false"
+            systemProperty("ide.mac.message.dialogs.as.sheets", "false")
+            systemProperty("jb.privacy.policy.text", "<!--999.999-->")
+            systemProperty("jb.consents.confirmation.enabled", "false")
+            systemProperty("ide.mac.file.chooser.native", "false")
+            systemProperty("jbScreenMenuBar.enabled", "false")
+            systemProperty("apple.laf.useScreenMenuBar", "false")
             systemProperty("idea.trust.all.projects", "true")
             systemProperty("ide.show.tips.on.startup.default.value", "false")
         }