diff --git a/.github/workflows/build_cibuildwheel.yml b/.github/workflows/build_cibuildwheel.yml index 69f8e637231c808ceee86940f8e543d5bfd7233a..0eb80423c7f1054a25f80c042e64dca66a1e32f2 100644 --- a/.github/workflows/build_cibuildwheel.yml +++ b/.github/workflows/build_cibuildwheel.yml @@ -32,9 +32,7 @@ jobs: CIBW_ARCHS: auto64 CIBW_ARCHS_MACOS: universal2 CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=10.15 - # max number of jobs, default eqs # logical processors; https://developercommunity.visualstudio.com/t/limit-cpu-usage-of-visual-studio/436208#T-N742131 - # CIBW_ENVIRONMENT_WINDOWS: EnforceProcessCountAcrossBuilds=true MultiProcMaxCount=1 - CIBW_ENVIRONMENT_WINDOWS: PreferredToolArchitecture=x64 + CIBW_BUILD_VERBOSITY_WINDOWS: 2 CIBW_SKIP: "*pypy*linux* *cp36*" - uses: actions/upload-artifact@v2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 26408d373e217eec50de308499f82bf22cbe9052..e22ad41a50965e34f1ead8322a441129e0e17e05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_OSX_ARCHITECTURES arm64 x86_64) +set(CMAKE_OSX_ARCHITECTURES x86_64;arm64 CACHE INTERNAL "archs for osx") cmake_minimum_required(VERSION 3.16) project(teqp) enable_testing()