From eca3350c87fc6a0afc51de84dad1c9f7f0000fb1 Mon Sep 17 00:00:00 2001
From: Alex Berezhnykh <alexey.berezhnykh@jetbrains.com>
Date: Wed, 27 Jul 2022 03:58:17 +0300
Subject: [PATCH 1/2] wip

---
 .github/workflows/ci.yml      | 9 +++++----
 rider-fsharp/build.gradle.kts | 8 +++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f701547920..bd7cc8cf63 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,15 +41,16 @@ jobs:
         working-directory: ./ReSharper.FSharp
         run: dotnet build -p:RunningOnGitHubActions=true
 
-      - name: Test ReSharper.FSharp
-        working-directory: ./ReSharper.FSharp
-        run: dotnet test --no-build
-
       - name: Build Plugin Frontend
         working-directory: ./rider-fsharp
         if: ${{ success() }} || ${{ failure() }}
         run: ./gradlew buildPlugin
 
+      - name: Frontend Tests
+        working-directory: ./rider-fsharp
+        if: ${{ success() }} || ${{ failure() }}
+        run: ./gradlew test -Prunning.on.github.actions=true
+
       - name: Stop Gradle Daemon # to collect Gradle cache
         working-directory: ./rider-fsharp
         run: ./gradlew --stop
diff --git a/rider-fsharp/build.gradle.kts b/rider-fsharp/build.gradle.kts
index 2eab89ccc6..2c3f69780f 100644
--- a/rider-fsharp/build.gradle.kts
+++ b/rider-fsharp/build.gradle.kts
@@ -318,7 +318,13 @@ tasks {
         }
         val rerunSuccessfulTests = false
         outputs.upToDateWhen { !rerunSuccessfulTests }
-        ignoreFailures = true
+
+        val runningOnGithubActions = when (ext.properties["running.on.github.actions"]) {
+            "true" -> true
+            else -> false
+        }
+        logger.lifecycle("Running on GitHub Actions: $runningOnGithubActions")
+        ignoreFailures = !runningOnGithubActions
     }
 
     create("writeDotNetSdkPathProps") {

From a280e088c47acee24715852070409441059fe78c Mon Sep 17 00:00:00 2001
From: Alex Berezhnykh <alexey.berezhnykh@jetbrains.com>
Date: Wed, 27 Jul 2022 04:15:17 +0300
Subject: [PATCH 2/2] wip

---
 .github/workflows/ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd7cc8cf63..50f8df5807 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,15 +41,10 @@ jobs:
         working-directory: ./ReSharper.FSharp
         run: dotnet build -p:RunningOnGitHubActions=true
 
-      - name: Build Plugin Frontend
-        working-directory: ./rider-fsharp
-        if: ${{ success() }} || ${{ failure() }}
-        run: ./gradlew buildPlugin
-
       - name: Frontend Tests
         working-directory: ./rider-fsharp
         if: ${{ success() }} || ${{ failure() }}
-        run: ./gradlew test -Prunning.on.github.actions=true
+        run: ./gradlew test "-Prunning.on.github.actions=true"
 
       - name: Stop Gradle Daemon # to collect Gradle cache
         working-directory: ./rider-fsharp