From a87f931dbeb9415e165d8423f0d6e6c8f09c345d Mon Sep 17 00:00:00 2001
From: Jakub Chrzanowski <jakub.chrzanowski@jetbrains.com>
Date: Tue, 8 Jun 2021 22:58:04 +0200
Subject: [PATCH] GitHub Actions: Run UI Tests workflow cleanup

---
 .github/workflows/run-ui-tests.yml | 101 ++++++++++-------------------
 build.gradle.kts                   |   2 +-
 2 files changed, 37 insertions(+), 66 deletions(-)

diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
index 455c64c..c6da402 100644
--- a/.github/workflows/run-ui-tests.yml
+++ b/.github/workflows/run-ui-tests.yml
@@ -1,84 +1,55 @@
-# GitHub Actions Workflow created for launching UI tests on linux, windows and mac in following steps:
-# - prepare and launch Idea with your plugin and robot-server plugin which is need to interact with UI
+# GitHub Actions Workflow created for launching UI tests on Linux, Windows, and Mac in the following steps:
+# - prepare and launch Idea with your plugin and robot-server plugin, which is need to interact with UI
 # - wait for the Idea started
-# - run UI tests with separate gradle task
-
-# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ Idea
-
+# - run UI tests with separate Gradle task
+#
+# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ IDEA.
+#
 # Workflow is triggered manually.
 
 name: Run UI Tests
 on:
   workflow_dispatch
-jobs:
-  build-for-ui-test-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Java
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
 
-      # Run IDEA prepared for UI testing
-      - name: Run Idea
-        run: |
-          export DISPLAY=:99.0
-          Xvfb -ac :99 -screen 0 1920x1080x16 &
-          gradle runIdeForUiTests &
-      - name: Wait for Idea started
-        uses: jtalk/url-health-check-action@v1.4
-        with:
-          url: http://127.0.0.1:8082
-          max-attempts: 15
-          retry-delay: 30s
+jobs:
 
-      # Run tests
-      - name: Tests
-        run: ./gradlew test
+  testUI:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            runIde: |
+              export DISPLAY=:99.0
+              Xvfb -ac :99 -screen 0 1920x1080x16 &
+              gradle runIdeForUiTests &
+          - os: windows-latest
+            runIde: start gradlew.bat runIdeForUiTests
+          - os: macos-latest
+            runIde: ./gradlew runIdeForUiTests &
 
-  build-for-ui-test-mac-os:
-    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup Java
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-
-      # Run IDEA prepared for UI testing
-      - name: Run Idea
-        run: ./gradlew runIdeForUiTests &
-      - name: Wait for Idea started
-        uses: jtalk/url-health-check-action@v1.4
-        with:
-          url: http://127.0.0.1:8082
-          max-attempts: 15
-          retry-delay: 30s
-
-      # Run tests
-      - name: Tests
-        run: ./gradlew test
 
-  build-for-ui-test-windows:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
+      # Setup Java 1.8 environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 11
+          distribution: zulu
+          java-version: 8
+
+      # Check out current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v2.3.4
 
       # Run IDEA prepared for UI testing
-      - name: Run Idea
-        run: start gradlew.bat runIdeForUiTests
-      - name: Wait for Idea started
-        uses: jtalk/url-health-check-action@v1.4
+      - name: Run IDE
+        run: ${{ matrix.runIde }}
+
+      # Wait for IDEA to be started
+      - name: Health Check
+        uses: jtalk/url-health-check-action@v1.5
         with:
           url: http://127.0.0.1:8082
           max-attempts: 15
           retry-delay: 30s
-
-      # Run tests
-      - name: Tests
-        run: gradle test
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 489c4a3..4a26fd6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -69,7 +69,7 @@ detekt {
 // Read more: https://github.com/JetBrains/intellij-ui-test-robot
 tasks {
     withType<DownloadRobotServerPluginTask> {
-        version = "0.10.3"
+        version.set("0.10.3")
     }
 
     withType<RunIdeForUiTestTask> {