Use different approach to saving JUnit results

Author: AlexanderWells-diamond

.github/workflows/code.yml

@@ -38,15 +38,18 @@ jobs:
         python: [cp36, cp37, cp38, cp39]
 
         include:
-          # Put coverage in the project directory for mac
+          # Put coverage and results files in the project directory for mac
           - os: macos-latest
             cov_file: "{project}/dist/coverage.xml"
+            results_file: "{project}/dist/pytest-results.xml"
           # And for windows
           - os: windows-latest
             cov_file: "{project}/dist/coverage.xml"
-          # But put coverage in the output dir mounted in docker for linux
+            results_file: "{project}/dist/pytest-results.xml"
+          # But put coverage and results files in the output dir mounted in docker for linux
           - os: ubuntu-latest
             cov_file: /output/coverage.xml
+            results_file: /output/pytest-results.xml
           # Build an sdist on linux so it has the right line endings
           - os: ubuntu-latest
             sdist: true
@@ -80,7 +83,7 @@ jobs:
         env:
           CIBW_BUILD: ${{ matrix.python }}*64
           CIBW_TEST_EXTRAS: dev
-          CIBW_TEST_COMMAND: pytest {project}/tests --cov-report xml:${{ matrix.cov_file }}
+          CIBW_TEST_COMMAND: pytest {project}/tests --cov-report xml:${{ matrix.cov_file }} --junit-xml=${{matrix.results_file}}
           # Disable auditwheel as it isn't compatible with setuptools_dso approach
           # https://github.com/mdavidsaver/setuptools_dso/issues/17
           CIBW_REPAIR_WHEEL_COMMAND: ""
@@ -105,7 +108,8 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: Unit Test Results (${{ matrix.os }}/${{ matrix.python }})
-          path: pytest-results.xml
+          path: ${{matrix.results_file}}
+          directory: dist
 
   publish-test-results:
     name: "Publish Unit Tests Results"

.gitignore

@@ -45,7 +45,6 @@ coverage.xml
 *.mypy_cache
 *.pytest_cache
 cov.xml
-pytest-results.xml
 
 # DLS build dir and virtual environment
 /prefix/

setup.cfg

@@ -59,7 +59,7 @@ extend-ignore =
 # Don't do flake8 here as we need to separate it out for CI
 addopts =
     --tb=native -vv --doctest-modules --ignore=iocStats --ignore=epicscorelibs --ignore=docs
-    --cov=softioc --cov-report term --cov-report xml:cov.xml --junit-xml=pytest-results.xml
+    --cov=softioc --cov-report term --cov-report xml:cov.xml
 
 [coverage:run]
 # This is covered in the versiongit test suite so exclude it here