fix merge conflict from master

Build-Squad · Dec 7, 2022 · b281e57 · b281e57
1 parent 4ee5cd5
commit b281e57
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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