From 9ee35b2ede8e73b9850f69644a3fb4934fb977b0 Mon Sep 17 00:00:00 2001
From: Eric Sessoms <coder5506@pobox.com>
Date: Sat, 9 Oct 2021 09:35:19 -0400
Subject: [PATCH] fix missing test report

Github seems to have a bug where test reports are not always associated with
their build.  As an attempt to work around this, I'm removing the reporting
workflow and adding the reports as a step in the build.  The expected
consequence is that we will no longer get test reports on pull requests, but
that's an acceptable tradeoff to not have to run around hunting for the reports
after a normal push.

More info at https://github.com/dorny/test-reporter/issues/67
---
 .github/workflows/buildship.yml | 14 +++++++-------
 .github/workflows/m3tests.yml   | 20 --------------------
 2 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/m3tests.yml

diff --git a/.github/workflows/buildship.yml b/.github/workflows/buildship.yml
index dd886c2e76..5c0d1eb0f5 100644
--- a/.github/workflows/buildship.yml
+++ b/.github/workflows/buildship.yml
@@ -57,13 +57,13 @@ jobs:
       run: |
         cd m3-sys/m3tests
         cm3 -DHTML
-    - name: Save compiler validation report
-      uses: actions/upload-artifact@v2
+    - name: Generate test report
+      uses: dorny/test-reporter@v1
       with:
-        name: ${{ format('m3tests-{0}-{1}', matrix.os, matrix.backend) }}
-        path: |
-          m3-sys/m3tests/m3tests.html
-          m3-sys/m3tests/m3tests-results.xml
-        if-no-files-found: error
+        name: ${{ format('m3tests ({0}, {1})', matrix.os, matrix.backend) }}
+        fail-on-error: false
+        max-annotations: 49
+        path: m3-sys/m3tests/m3tests-results.xml
+        reporter: java-junit
 
 # vim: expandtab
diff --git a/.github/workflows/m3tests.yml b/.github/workflows/m3tests.yml
deleted file mode 100644
index f23fb1716e..0000000000
--- a/.github/workflows/m3tests.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: m3tests results
-on:
-  workflow_run:
-    workflows: ["buildship integration"]
-    type: [completed]
-jobs:
-  report:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: dorny/test-reporter@v1
-      with:
-        artifact: /m3tests-(.*)-(.*)/
-        fail-on-error: false
-        max-annotations: 49
-        name: "m3tests ($1, $2)"
-        path: m3tests-results.xml
-        reporter: java-junit
-
-# vim: expandtab