From 2cc868eb21ce7fac06dcfd434744bf53daa93ee3 Mon Sep 17 00:00:00 2001
From: Christopher Hounsom <39617426+chris-j-h@users.noreply.github.com>
Date: Thu, 2 May 2024 21:33:55 +0100
Subject: [PATCH] Re-enable test failures, prevent GitHub Actions cache issues
 (#214)

* Disable suppression of test failures

* Prevent GitHub Actions cache collision issues
---
 .github/workflows/run-extra.yml | 6 +++---
 .github/workflows/run.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/run-extra.yml b/.github/workflows/run-extra.yml
index d04fdc98..199ccd33 100644
--- a/.github/workflows/run-extra.yml
+++ b/.github/workflows/run-extra.yml
@@ -71,7 +71,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.prepare.outputs.output_dir }}
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}-extra
       - name: 'Check out project files'
         if: steps.cache-image.outputs.cache-hit != 'true'
         uses: actions/checkout@v2
@@ -201,7 +201,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ needs.docker-build.outputs.output_dir }}
-          key: ${{ github.sha }}
+          key: ${{ github.sha }}-extra
       - name: 'Prepare environment'
         id: setup
         run: |
@@ -265,11 +265,11 @@ jobs:
               -v ${{ steps.setup.outputs.outputDir }}:${{ steps.setup.outputs.outputDir }} \
               --env-file ${{ steps.setup.outputs.dockerEnvFile }} \
               ${{ needs.docker-build.outputs.image_name }} test \
-                -PgaugeFailSafe \
                 -Pauto \
                 -Dtags="${{ matrix.tag }}" ${{ steps.setup.outputs.mvnArg }} \
                 -Dauto.outputDir=${{ steps.setup.outputs.outputDir }} \
                 -Dauto.jobid=${{ steps.setup.outputs.tag }}
+          #      -PgaugeFailSafe \
       - name: 'Failure info'
         if: ${{ failure() }}
         run: |
diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
index 14529100..329e24ca 100644
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@@ -211,11 +211,11 @@ jobs:
               -v ${{ steps.setup.outputs.outputDir }}:${{ steps.setup.outputs.outputDir }} \
               --env-file ${{ steps.setup.outputs.dockerEnvFile }} \
               ${{ needs.docker-build.outputs.image_name }} test \
-                -PgaugeFailSafe \
                 -Pauto \
                 -Dtags="${{ matrix.tag }}" ${{ steps.setup.outputs.mvnArg }} \
                 -Dauto.outputDir=${{ steps.setup.outputs.outputDir }} \
                 -Dauto.jobid=${{ steps.setup.outputs.tag }}
+          #      -PgaugeFailSafe \
       - name: 'Failure info'
         if: ${{ failure() }}
         run: |