Combine error log

sersoft-gmbh · Apr 22, 2020 · 7f325d9 · 7f325d9
1 parent f75a305
commit 7f325d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/master-deploy.yml b/.github/workflows/master-deploy.yml
@@ -133,9 +133,7 @@ jobs:
             EXPECTED_COMMAND="${EXPECTED_COMMAND} | xcpretty"
           fi
           if [ "${EXPECTED_COMMAND}" != "${{steps.xcodebuild.outputs.executed-command}}" ]; then
-            printf "::error::Executed command did not match expectations!\n"
-            printf "::error::Executed: ${{steps.xcodebuild.outputs.executed-command}}\n"
-            printf "::error::Expected: ${EXPECTED_COMMAND}\n"
+            printf "::error::Executed command did not match expectations!\nExecuted: ${{steps.xcodebuild.outputs.executed-command}}\nExpected: ${EXPECTED_COMMAND}\n"
             exit 1
           fi
 
@@ -179,8 +177,6 @@ jobs:
             EXPECTED_COMMAND="${EXPECTED_COMMAND} | xcpretty"
           fi
           if [ "${EXPECTED_COMMAND}" != "${{steps.xcodebuild.outputs.executed-command}}" ]; then
-            printf "::error::Executed command did not match expectations!\n"
-            printf "::error::Executed: ${{steps.xcodebuild.outputs.executed-command}}\n"
-            printf "::error::Expected: ${EXPECTED_COMMAND}\n"
+            printf "::error::Executed command did not match expectations!\nExecuted: ${{steps.xcodebuild.outputs.executed-command}}\nExpected: ${EXPECTED_COMMAND}\n"
             exit 1
           fi
diff --git a/.github/workflows/pull-request-tests.yml b/.github/workflows/pull-request-tests.yml
@@ -124,9 +124,7 @@ jobs:
             EXPECTED_COMMAND="${EXPECTED_COMMAND} | xcpretty"
           fi
           if [ "${EXPECTED_COMMAND}" != "${{steps.xcodebuild.outputs.executed-command}}" ]; then
-            printf "::error::Executed command did not match expectations!\n"
-            printf "::error::Executed: ${{steps.xcodebuild.outputs.executed-command}}\n"
-            printf "::error::Expected: ${EXPECTED_COMMAND}\n"
+            printf "::error::Executed command did not match expectations!\nExecuted: ${{steps.xcodebuild.outputs.executed-command}}\nExpected: ${EXPECTED_COMMAND}\n"
             exit 1
           fi
 
@@ -173,8 +171,6 @@ jobs:
             EXPECTED_COMMAND="${EXPECTED_COMMAND} | xcpretty"
           fi
           if [ "${EXPECTED_COMMAND}" != "${{steps.xcodebuild.outputs.executed-command}}" ]; then
-            printf "::error::Executed command did not match expectations!\n"
-            printf "::error::Executed: ${{steps.xcodebuild.outputs.executed-command}}\n"
-            printf "::error::Expected: ${EXPECTED_COMMAND}\n"
+            printf "::error::Executed command did not match expectations!\nExecuted: ${{steps.xcodebuild.outputs.executed-command}}\nExpected: ${EXPECTED_COMMAND}\n"
             exit 1
           fi