Update build.yaml

Author: timkpaine

.github/workflows/build.yaml

@@ -19,7 +19,6 @@ permissions:
 
 jobs:
   build:
-<<<<<<< before updating
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -31,16 +30,11 @@ jobs:
             - "3.11"
           cibuildwheel:
             - "cp311"
-=======
-    runs-on: ubuntu-latest
-
->>>>>>> after updating
     steps:
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-<<<<<<< before updating
           submodules: 'true'
 
       - name: Setup cache (mac/linux)
@@ -53,43 +47,6 @@ jobs:
 
       - name: Setup cache (windows)
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9  # v6.1.0
-=======
-
-      - name: Setup Python
-        uses: actions-ext/python/setup@6e1b91a408ea89f49bc8aff8724f83826f7b5446
-        with:
-          version: "3.11"
-
-      - name: Install dependencies
-        run: make develop
-
-      - name: Lint
-        run: make lint
-
-      - name: Checks
-        run: make checks
-
-      - name: Build
-        run: make build
-
-      - name: Test
-        run: make coverage
-
-      - name: Upload test results (Python)
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
-        with:
-          name: test-results
-          path: junit.xml
-        if: always()
-
-      - name: Publish test results
-        uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3  # v2.24.0
-        with:
-          files: '**/junit.xml'
-
-      - name: Upload coverage
-        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f  # v7.0.0
->>>>>>> after updating
         with:
           path: "C:/ProgramData/chocolatey/"
           key: cache-${{ runner.os }}-
@@ -142,7 +99,6 @@ jobs:
       - name: Upload Wheel
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
         with:
-<<<<<<< before updating
           name: dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
           path: dist/*.whl
 
@@ -159,7 +115,3 @@ jobs:
 
       - name: Test Wheel
         run: python -m pytest -vvv openfpgaloader/tests
-=======
-          name: dist
-          path: dist
->>>>>>> after updating