report all steps?

Author: DavidSpickett

.ci/generate-buildkite-pipeline-premerge

@@ -286,11 +286,6 @@ if [[ "${linux_projects}" != "" ]]; then
     CXX: 'clang++'
   commands:
   - './.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"'
-  - wait: ~
-    continue_on_failure: true
-  - plugins:
-      - junit-annotate#v2.5.0:
-          artifacts: build/test-results*.xml
 EOF
 fi
 
@@ -316,10 +311,13 @@ if [[ "${windows_projects}" != "" ]]; then
   commands:
   - 'C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64'
   - 'bash .ci/monolithic-windows.sh "$(echo ${windows_projects} | tr ' ' ';')" "$(echo ${windows_check_targets})"'
-  - wait: ~
-    continue_on_failure: true
-  - plugins:
-      - junit-annotate#v2.5.0:
-          artifacts: build/test-results*.xml
 EOF
 fi
+
+cat <<EOF
+- wait: ~
+  continue_on_failure: true
+- plugins:
+    - junit-annotate#v2.5.0:
+        artifacts: build/test-results*.xml
+EOF