@@ -19,22 +19,18 @@ permissions:
 
 jobs:
   build:
-<<<<<<< before updating
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
           os:
             - ubuntu-24.04
-            - macos-14
-            - windows-2022
+            - macos-26
+            - windows-2025
           python-version:
             - "3.11"
           cibuildwheel:
             - "cp311"
-=======
-    runs-on: ubuntu-24.04
 
->>>>>>> after updating
     steps:
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -53,27 +49,13 @@ jobs:
       - name: Setup cache (windows)
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9  # v6.1.0
         with:
-<<<<<<< before updating
           path: "C:/ProgramData/chocolatey/"
           key: cache-${{ runner.os }}-
           restore-keys: cache-${{ runner.os }}-
         if: ${{ runner.os == 'Windows' }}
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.0
-=======
-          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@0b35c9ecc4f0529d0eb674914510c22f85b196b4  # v7.1.0
->>>>>>> after updating
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'