fix build, cleanup build.yml

.github/workflows/build.yaml

@@ -17,61 +17,69 @@ jobs:
       matrix:
         include:
           - os: windows-2019
-            cibw_archs_windows: AMD64
+            cibw_archs: AMD64
+            cibw_build: "*"
             cibw_environment: APNGASM_COMPILE_TARGET=x86_64
           - os: windows-2019
-            cibw_archs_windows: x86
+            cibw_archs: x86
+            cibw_build: "*"
             cibw_environment: APNGASM_COMPILE_TARGET=x86
           - os: windows-2019
-            cibw_archs_windows: ARM64
+            cibw_archs: ARM64
+            cibw_build: "*"
             cibw_environment: APNGASM_COMPILE_TARGET=armv8
           - os: macos-11
-            cibw_archs_macos: x86_64
+            cibw_archs: x86_64
+            cibw_build: "*"
             cibw_environment: >
               APNGASM_COMPILE_TARGET=x86_64
               _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64
               MACOSX_DEPLOYMENT_TARGET=10.15
           - os: macos-11
-            cibw_archs_macos: arm64
+            cibw_archs: arm64
+            cibw_build: "*"
             cibw_environment: >
               APNGASM_COMPILE_TARGET=armv8
               _PYTHON_HOST_PLATFORM=macosx-11.0-arm64
               MACOSX_DEPLOYMENT_TARGET=11.0
           - os: macos-11
-            cibw_archs_macos: universal2
+            cibw_archs: universal2
+            cibw_build: "*"
             cibw_environment: >
               APNGASM_COMPILE_TARGET=universal2
               _PYTHON_HOST_PLATFORM=macosx-11.0-universal2
               MACOSX_DEPLOYMENT_TARGET=11.0
           - os: ubuntu-20.04
-            cibw_archs_linux: x86_64
+            cibw_archs: x86_64
+            cibw_build: "*"
             cibw_environment: APNGASM_COMPILE_TARGET=x86_64
           - os: ubuntu-20.04
-            cibw_archs_linux: i686
+            cibw_archs: i686
+            cibw_build: "*"
             cibw_environment: APNGASM_COMPILE_TARGET=x86
           - os: ubuntu-20.04
-            cibw_archs_linux: aarch64
-            cibw_skip: "*-muslinux_*"
+            cibw_archs: aarch64
+            cibw_build: "*-muslinux_*"
             cibw_environment: APNGASM_COMPILE_TARGET=armv8
           - os: ubuntu-20.04
-            cibw_archs_linux: aarch64
-            cibw_skip: "*-manylinux_*"
+            cibw_archs: aarch64
+            cibw_build: "*-manylinux_*"
             cibw_environment: APNGASM_COMPILE_TARGET=armv8
           - os: ubuntu-20.04
-            cibw_archs_linux: ppc64le
-            cibw_skip: "*-muslinux_*"
+            cibw_archs: ppc64le
+            cibw_build: "*-muslinux_*"
             cibw_environment: APNGASM_COMPILE_TARGET=ppc64le
           - os: ubuntu-20.04
-            cibw_archs_linux: ppc64le
-            cibw_skip: "*-manylinux_*"
+            cibw_archs: ppc64le
+            cibw_build: "*-manylinux_*"
             cibw_environment: APNGASM_COMPILE_TARGET=ppc64le
           - os: ubuntu-20.04
-            cibw_archs_linux: s390x
-            cibw_skip: "*-muslinux_*"
+            cibw_archs: s390x
+            cibw_build: "*-muslinux_*"
             cibw_environment: APNGASM_COMPILE_TARGET=s390x
           - os: ubuntu-20.04
-            cibw_archs_linux: s390x
-            cibw_skip: "*-manylinux_*"
+            cibw_archs: s390x
+            cibw_build: "*-manylinux_*"
             cibw_environment: APNGASM_COMPILE_TARGET=s390x
 
     steps:
@@ -85,17 +93,15 @@ jobs:
         with:
           platforms: all
 
-      - name: Build wheels
+      - name: Build wheels for ${{ matrix.os }} ${{ matrix.cibw_archs }} ${{ matrix.cibw_build }}
         uses: pypa/[email protected]
         env:
           CIBW_BUILD_FRONTEND: build
-          CIBW_ARCHS_WINDOWS: ${{ matrix.cibw_archs_windows }}
-          CIBW_ARCHS_MACOS: ${{ matrix.cibw_archs_macos }}
-          CIBW_ARCHS_LINUX: ${{ matrix.cibw_archs_linux }}
+          CIBW_ARCHS: ${{ matrix.cibw_archs }}
           CIBW_BEFORE_ALL: ${{ matrix.cibw_before_all }}
           # CIBW_ENVIRONMENT: PY_BUILD_CMAKE_VERBOSE=1 ${{ matrix.cibw_environment }}
           CIBW_ENVIRONMENT: ${{ matrix.cibw_environment }}
-          CIBW_SKIP: cp36* cp37* pp37* ${{ matrix.cibw_skip }}
+          CIBW_BUILD: cp36* cp37* pp37* ${{ matrix.cibw_build }}
 
       - uses: actions/upload-artifact@v3
         with:

conanfile.py

@@ -23,7 +23,7 @@ def build(self):
     def generate(self):
         tc = CMakeToolchain(self)
         cmake = CMakeDeps(self)
-        if is_apple_os(self) and get_arch == 'universal2':
+        if is_apple_os(self) and get_arch() == 'universal2':
             tc.blocks['apple_system'].values['cmake_osx_architectures'] = 'x86_64; arm64'
         tc.generate()
         cmake.generate()