From 341dd6bca3358708847a1daddec63bf177a3f2b4 Mon Sep 17 00:00:00 2001
From: Robin Munn <rmunn@pobox.com>
Date: Thu, 14 Mar 2024 15:07:36 -0500
Subject: [PATCH] Revert "Temporarily disable tests in CI"

This reverts commit 376030a7a0f36fbaeedd9410915dbcdac0540f42.
---
 .github/workflows/ci+cd.yml | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci+cd.yml b/.github/workflows/ci+cd.yml
index 6f0dc172..3271e060 100644
--- a/.github/workflows/ci+cd.yml
+++ b/.github/workflows/ci+cd.yml
@@ -52,24 +52,20 @@ jobs:
     # Unfortunately we need two test steps because we need different filters.
     # We could conditionally set an environment variable, but unfortunately
     # the syntax to access that is different on Windows vs Linux.
+    - name: Test on Linux
+      run: dotnet test --no-build -c Release --filter TestCategory!=RequiresUI -- NUnit.TestOutputXml=TestResults
+      if: matrix.os == 'ubuntu-latest'
+
+    - name: Test on Windows
+      run: dotnet test --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults
+      if: matrix.os == 'windows-latest'
 
-    # Tests disabled temporarily while we iterate on the build process. They're all working except for the one flaky one,
-    # but they take two hours to run so it's hard to iterate. - 2024-03 RM
-    # CODE REVIEW NOTE: If I forget to uncomment this block before submitting the PR for review, yell at me in code review.
-    # - name: Test on Linux
-    #   run: dotnet test --no-build -c Release --filter TestCategory!=RequiresUI -- NUnit.TestOutputXml=TestResults
-    #   if: matrix.os == 'ubuntu-latest'
-
-    # - name: Test on Windows
-    #   run: dotnet test --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults
-    #   if: matrix.os == 'windows-latest'
-
-    # - name: Upload Test Results
-    #   if: always()
-    #   uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
-    #   with:
-    #     name: Test Results (${{matrix.os}})
-    #     path: "**/TestResults/*.xml"
+    - name: Upload Test Results
+      if: always()
+      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      with:
+        name: Test Results (${{matrix.os}})
+        path: "**/TestResults/*.xml"
 
     - name: Checkout Chorus Help # required for Chorus Merge Module
       uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2