Account for the different behaviour of echo on Windows and Linux

ukhsa-collaboration · Aug 5, 2024 · 3995597 · 3995597
1 parent 7697464
commit 3995597
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/distribute_package.yml b/.github/workflows/distribute_package.yml
@@ -74,13 +74,23 @@ jobs:
       - name: Install cibuildwheel
         run: python -m pip install cibuildwheel>=2.19.2
 
+      # Need to duplicate these two lines as it seems Windows and Linux echo treats qutotes differently
       - name: Build and test the wheels
+        if: matrix.os == 'ubuntu-latest'
         run: python -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.platform_id }}*
           CIBW_TEST_COMMAND: python -W default -m unittest discover --start-directory {project}/tests
           # setuptools_scm workaround for https://github.com/pypa/setuptools_scm/issues/455
           CIBW_BEFORE_BUILD: ${{ github.ref == 'refs/heads/dev' &&  'echo ''local_scheme = "no-local-version"'' >> pyproject.toml && git diff --color=always && git update-index --assume-unchanged pyproject.toml' || '' }}
+      - name: Build and test the wheels
+        if: matrix.os == 'windows-latest'
+        run: python -m cibuildwheel --output-dir wheelhouse
+        env:
+          CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.platform_id }}*
+          CIBW_TEST_COMMAND: python -W default -m unittest discover --start-directory {project}/tests
+          # setuptools_scm workaround for https://github.com/pypa/setuptools_scm/issues/455
+          CIBW_BEFORE_BUILD: ${{ github.ref == 'refs/heads/dev' &&  'echo local_scheme = "no-local-version" >> pyproject.toml && git diff --color=always && git update-index --assume-unchanged pyproject.toml' || '' }}
 
       # Upload the results
       - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/test_package.yml b/.github/workflows/test_package.yml
@@ -56,12 +56,16 @@ jobs:
       - name: Install pip 
         run: |
           python -m pip install --upgrade pip
+
+      - name: Install coverage 
+        run: |
+          python -m pip install codecov
           
       - name: install PyGOM
         run: |
           pip install .
 
       - name: Run tests
-        run: python -m unittest discover --verbose --start-directory tests
+        run: coverage run -m unittest discover --verbose --start-directory tests
 
-      #TODO: Could also do something about coverage here too
+