From 573c9ae861f72670fa57703d95c7bf72b6c0a674 Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Mon, 10 Feb 2025 11:11:49 -0800
Subject: [PATCH] Fix test result artifact collection paths.

---
 .github/workflows/ci.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dac09704a..44d134245 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -231,19 +231,19 @@ jobs:
             tox-env: typecheck,package,docs
           - python-version: [ 3, 13 ]
             tox-env: py313-pip25_0
-            artifact-name: unit-tests
+            artifact-name: unit
             cache: true
-            pex-test-pos-args: ${{ needs.setup.outputs.pex_test_posargs }} --junit-xml ../dist/reports/tests-unit.xml
+            pex-test-pos-args: ${{ needs.setup.outputs.pex_test_posargs }} --junit-xml ../dist/test-results/unit.xml
           - python-version: [ 3, 13 ]
             tox-env: py313-pip25_0-integration
-            artifact-name: integration-tests-1
+            artifact-name: integration-1
             cache: true
-            pex-test-pos-args: --shard 1/2 ${{ needs.setup.outputs.pex_test_posargs }} --junit-xml ../dist/reports/tests-integration-1.xml
+            pex-test-pos-args: --shard 1/2 ${{ needs.setup.outputs.pex_test_posargs }} --junit-xml ../dist/test-results/integration-1.xml
           - python-version: [ 3, 13 ]
             tox-env: py313-pip25_0-integration
-            artifact-name: integration-tests-2
+            artifact-name: integration-2
             cache: true
-            pex-test-pos-args: --shard 2/2 ${{ needs.setup.outputs.pex_test_posargs }} --junit-xml ../dist/reports/tests-integration-2.xml
+            pex-test-pos-args: --shard 2/2 ${{ needs.setup.outputs.pex_test_posargs }} --junit-xml ../dist/test-results/integration-2.xml
     steps:
       - name: Checkout Pex
         uses: actions/checkout@v4
@@ -283,7 +283,7 @@ jobs:
         if: always() && matrix.artifact-name
         with:
           name: test-results-${{ matrix.artifact-name }}
-          path: dist/reports/tests-*.xml
+          path: dist/test-results/
       - name: Cache Devpi Server
         uses: actions/cache/save@v4
         if: matrix.cache && github.ref == 'refs/heads/main'
@@ -296,13 +296,10 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/download-artifact@v4
-        with:
-          path: dist/reports/
       - uses: actions/upload-artifact@v4
-        if: always()
         with:
           name: test-results
-          path: dist/reports/tests-*.xml
+          path: dist/test-results/
   final-status:
     name: Gather Final Status
     needs: