Revert "Update build to support macOS arm64/x86_64 (#82)" (#84)

This reverts commit c465065.
miute · Apr 24, 2024 · 68f4297 · 68f4297
1 parent c465065
commit 68f4297
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,52 +7,39 @@ on:
   workflow_dispatch:
 
 env:
-  MACOSX_DEPLOYMENT_TARGET: "11.0"
+  MACOSX_DEPLOYMENT_TARGET: "10.15"
 
 jobs:
-  build_wheels:
+  build:
     runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: "recursive"
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v2.16.5
         env:
-          CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-*"
           CIBW_BUILD_FRONTEND: build
           CIBW_ARCHS_LINUX: x86_64
           CIBW_ARCHS_WINDOWS: AMD64
+          CIBW_ARCHS_MACOS: universal2
           CIBW_SKIP: "*-musllinux_* pp*"
           CIBW_TEST_REQUIRES: pytest
           CIBW_TEST_COMMAND: pytest {project}/tests
-          CIBW_TEST_SKIP: "cp38-macosx_*:arm64"
 
       - name: Build sdist
         if: startsWith(matrix.os, 'ubuntu')
         run: pipx run build --sdist
 
       - uses: actions/upload-artifact@v4
         with:
-          name: dist-pugixml-${{matrix.os}}
+          name: dist
           path: |
             ./wheelhouse/*.whl
             ./dist/*.tar.gz
-
-  merge_wheels:
-    name: Merge all built wheels into one artifact
-    runs-on: ubuntu-latest
-    needs: build_wheels
-    steps:
-      - name: Merge wheels
-        uses: actions/upload-artifact/merge@v4
-        with:
-          name: dist
-          pattern: dist-*
-          delete-merged: true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,13 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        exclude:
-          - os: macos-14
-            python-version: "3.8"
-          - os: macos-14
-            python-version: "3.9"
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4