From 89429ade49f4638426fbc9ff9150ae4553a2df28 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 5 Jan 2023 11:22:47 +0000
Subject: [PATCH 1/3] If a trcli run fails, continue further uploads, and do
 not fail the GHA.

---
 .github/workflows/cypress.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index 59e904ee0e..6fdeaaa416 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -230,7 +230,7 @@ jobs:
                   TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
                   TESTRAIL_RUN_ID: ${{ steps.testrailprep.outputs.run_id }}
               run: |
-                  for file in results-*.xml; do
+                   for file in results-*.xml; do
                       echo "Handling $file"
                       trcli -y -h $TESTRAIL_URL \
                                   --project-id $TESTRAIL_PROJECT_ID \
@@ -241,8 +241,9 @@ jobs:
                                   --run-id $TESTRAIL_RUN_ID \
                                   --suite-id $TESTRAIL_SUITE_ID \
                                   --title "if you see this please check cypress build for run id not being provisioned" \
-                                  -f $file
-                  done
+                                  -f $file || true
+                      #  We want to keep uploading what we can; but don't want the failures/red marks when it fails, so we add || true above.
+                  done 
             - name: Close test run
               id: testrailpost
               if: always()

From 0daa51785467076c7fa130daecb886ef9fb9e972 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 5 Jan 2023 11:27:03 +0000
Subject: [PATCH 2/3] Remove accidental whitespace

---
 .github/workflows/cypress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index 6fdeaaa416..88c586969e 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -230,7 +230,7 @@ jobs:
                   TESTRAIL_API_KEY: ${{ secrets.TESTRAIL_API_KEY }}
                   TESTRAIL_RUN_ID: ${{ steps.testrailprep.outputs.run_id }}
               run: |
-                   for file in results-*.xml; do
+                  for file in results-*.xml; do
                       echo "Handling $file"
                       trcli -y -h $TESTRAIL_URL \
                                   --project-id $TESTRAIL_PROJECT_ID \

From 9416c27bc77c325590ba631876c94f974833c3cc Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 5 Jan 2023 11:53:53 +0000
Subject: [PATCH 3/3] Prettier whitespace changes

---
 .github/workflows/cypress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index 88c586969e..603b95f7f7 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -243,7 +243,7 @@ jobs:
                                   --title "if you see this please check cypress build for run id not being provisioned" \
                                   -f $file || true
                       #  We want to keep uploading what we can; but don't want the failures/red marks when it fails, so we add || true above.
-                  done 
+                  done
             - name: Close test run
               id: testrailpost
               if: always()