fix wheels

icecube · Feb 8, 2024 · 564dec2 · 564dec2
1 parent 59c7c2a
commit 564dec2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -123,7 +123,8 @@ jobs:
           pwd
           ls -l
           ls -l /home/runner/work/nuflux/nuflux
-          mv -v build/meson-logs/testlog.junit.xml test-results-meson-cvmfs-${{matrix.cvmfs}}.junit.xml
+          ls -l build/meson-logs/testlog.junit.xml
+          cp -v build/meson-logs/testlog.junit.xml test-results-meson-cvmfs-${{matrix.cvmfs}}.junit.xml
       - uses: actions/upload-artifact@v4
         if: always()
         with:
@@ -151,7 +152,7 @@ jobs:
             eval $(/cvmfs/icecube.opensciencegrid.org/${{matrix.cvmfs}}/setup.sh)
             python3 -m pip install --upgrade --user pip 'pytest<8'
             BOOST_ROOT=${SROOT} python3 -m pip install --user --verbose /nf
-            python3 -m pytest /nf --junit-xml=/nf/test-results-pyproject-cvmfs-${{matrix.os}}.junit.xml
+            python3 -m pytest /nf --junit-xml=/nf/test-results-pyproject-cvmfs-${{matrix.cvmfs}}.junit.xml
       - uses: actions/upload-artifact@v4
         if: always()
         with:

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -77,7 +77,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Test
         working-directory: tests
-        run: ./test_fluxes.py --junit-xml=/nf/test-results-cibw-${{ matrix.python-version }}.junit.xml
+        run: ./test_fluxes.py --junit-xml=test-results-cibw-${{ matrix.python-version }}.junit.xml
   cvmfs_test_wheel:
     name: Test Wheel with cvmfs ${{matrix.cvmfs}}
     needs: build_wheels
@@ -109,8 +109,8 @@ jobs:
           image: centos:centos7.9.2009
           run: |
             eval $(/cvmfs/icecube.opensciencegrid.org/${{matrix.cvmfs}}/setup.sh)
-            python3 -m pip install --user pytest /nuflux/nuflux-*-${{matrix.python-tag}}-*.whl
-            python3 /nuflux/tests/test_fluxes.py --junit-xml=/nf/test-results-cibw-cvmfs-${{ matrix.cvmfs }}.junit.xml
+            python3 -m pip install --user 'pytest<8' /nuflux/nuflux-*-${{matrix.python-tag}}-*.whl
+            python3 /nuflux/tests/test_fluxes.py --junit-xml=test-results-cibw-cvmfs-${{ matrix.cvmfs }}.junit.xml
   upload_pypi:
     needs: [cvmfs_test_wheel, test_wheels, build_sdist]
     runs-on: ubuntu-latest