annotate per platform

Author: DavidSpickett

.ci/generate-buildkite-pipeline-premerge

@@ -269,10 +269,11 @@ windows_projects=$(add-dependencies ${windows_projects_to_test} | sort | uniq)
 if [[ "${linux_projects}" != "" ]]; then
   cat <<EOF
 - label: ':linux: Linux x64'
+  key: "test Linux"
   artifact_paths:
   - 'artifacts/**/*'
   - '*_result.json'
-  - 'build/test-results*.xml'
+  - 'build/test-results-linux*.xml'
   agents: ${LINUX_AGENTS}
   retry:
     automatic:
@@ -286,16 +287,23 @@ 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})"'
+- plugins:
+    - junit-annotate#v2.5.0:
+        artifacts: build/test-results-linux*.xml
+        context: "linux-test-results"
+  depends_on: "test Linux"
+  allow_dependency_failure: true
 EOF
 fi
 
 if [[ "${windows_projects}" != "" ]]; then
   cat <<EOF
 - label: ':windows: Windows x64'
+  key: "test Windows"
   artifact_paths:
   - 'artifacts/**/*'
   - '*_result.json'
-  - 'build/test-results*.xml'
+  - 'build/test-results-windows*.xml'
   agents: ${WINDOWS_AGENTS}
   retry:
     automatic:
@@ -311,13 +319,15 @@ 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})"'
+- plugins:
+    - junit-annotate#v2.5.0:
+        artifacts: build/test-results-windows*.xml
+        context: "windows-test-results"
+  depends_on: "test Windows"
+  allow_dependency_failure: true
 EOF
 fi
 
 cat <<EOF
-- wait: ~
-  continue_on_failure: true
-- plugins:
-    - junit-annotate#v2.5.0:
-        artifacts: build/test-results*.xml
+
 EOF

.ci/monolithic-linux.sh

@@ -37,7 +37,7 @@ trap show-stats EXIT
 projects="${1}"
 targets="${2}"
 
-lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --use-unique-output-file-name --timeout=1200 --time-tests"
+lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results-linux.xml --use-unique-output-file-name --timeout=1200 --time-tests"
 
 echo "--- cmake"
 pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt

.ci/monolithic-windows.sh

@@ -53,7 +53,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D LLVM_ENABLE_ASSERTIONS=ON \
       -D LLVM_BUILD_EXAMPLES=ON \
       -D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --use-unique-output-file-name --timeout=1200 --time-tests" \
+      -D LLVM_LIT_ARGS="-v --xunit-xml-output ${BUILD_DIR}/test-results-windows.xml --use-unique-output-file-name --timeout=1200 --time-tests" \
       -D COMPILER_RT_BUILD_ORC=OFF \
       -D CMAKE_C_COMPILER_LAUNCHER=sccache \
       -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \