Merge branch 'master' into 345-use-constraints

pace-neutrons · Dec 20, 2024 · c90a253 · c90a253
2 parents 77c74aa + daad68b
commit c90a253
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/test_release_conda.yml b/.github/workflows/test_release_conda.yml
@@ -12,14 +12,15 @@ on:
       version:
         description: 'The Euphonic release version to test e.g. 0.6.1'
         required: true
+        type: string
 
 jobs:
   test:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
         python-version: ['3.10', '3.11', '3.12']
-      fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -49,10 +50,10 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Unit test results ${{ matrix.os }} ${{ matrix.python-version }}
+          name: Conda-forge unit test results ${{ matrix.os }} ${{ matrix.python-version }}
           path: tests_and_analysis/test/reports/junit_report*.xml
 
-  publish-test-results:
+  publish-conda-test-results:
     needs: test
     runs-on: ubuntu-latest
     if: success() || failure()
@@ -61,7 +62,8 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: artifacts
-      - name: Publish test results
+      - name: Publish Conda test results
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
-          junit_files: artifacts/**/junit_report*.xml
+          junit_files: artifacts/Conda***/junit_report*.xml
+          check_name: Conda-forge test results
diff --git a/.github/workflows/test_release_pypi.yml b/.github/workflows/test_release_pypi.yml
@@ -12,13 +12,14 @@ on:
       version:
         description: 'The Euphonic release version to test e.g. 0.6.1'
         required: true
+        type: string
 
 jobs:
   test:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-      fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -75,10 +76,10 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Unit test results ${{ matrix.os }}
+          name: PyPI unit test results ${{ matrix.os }}
           path: tests_and_analysis/test/reports/junit_report*.xml
 
-  publish-test-results:
+  publish-pypi-test-results:
     needs: test
     runs-on: ubuntu-latest
     if: success() || failure()
@@ -87,7 +88,8 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: artifacts
-      - name: Publish test results
+      - name: Publish PyPI test results
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
-          junit_files: artifacts/**/junit_report*.xml
+          junit_files: artifacts/PyPI**/junit_report*.xml
+          check_name: PyPI test results