From b281e57b114d7113c4f7ae70e8916b03f7e39725 Mon Sep 17 00:00:00 2001
From: Peter Argue <89119817+peterargue@users.noreply.github.com>
Date: Tue, 6 Dec 2022 21:20:30 -0800
Subject: [PATCH] fix merge conflict from master

---
 .github/workflows/ci.yml               | 2 +-
 .github/workflows/flaky-test-debug.yml | 2 +-
 tools/test_monitor/run-tests.sh        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index acfbf5f8b61..5f53eb0aa03 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -217,7 +217,7 @@ jobs:
     - name: Build relic
       run: make crypto_setup_gopath
     - name: Docker build
-      run: make docker-build-flow docker-build-flow-corrupted
+      run: make docker-build-flow docker-build-flow-corrupt
     - name: Run tests
       if: github.actor != 'bors[bot]'
       run: ${{ matrix.make }}
diff --git a/.github/workflows/flaky-test-debug.yml b/.github/workflows/flaky-test-debug.yml
index d8c1a05dad5..ffd0f027a4b 100644
--- a/.github/workflows/flaky-test-debug.yml
+++ b/.github/workflows/flaky-test-debug.yml
@@ -209,7 +209,7 @@ jobs:
       - name: Build relic
         run: make crypto_setup_gopath
       - name: Docker build
-        run: make docker-build-flow docker-build-flow-corrupted
+        run: make docker-build-flow docker-build-flow-corrupt
       - name: Run tests
         if: github.actor != 'bors[bot]'
         run: ${{ matrix.make }}
diff --git a/tools/test_monitor/run-tests.sh b/tools/test_monitor/run-tests.sh
index b61cc17349f..0cbf1383b19 100755
--- a/tools/test_monitor/run-tests.sh
+++ b/tools/test_monitor/run-tests.sh
@@ -24,7 +24,7 @@ then
 
   echo "preparing $TEST_CATEGORY tests">&2
   make crypto_setup_gopath
-  make docker-build-flow docker-build-flow-corrupted
+  make docker-build-flow docker-build-flow-corrupt
   echo "running $TEST_CATEGORY tests">&2
   make -C integration -s ${BASH_REMATCH[1]}-tests > test-output
 else