Try Linux builds

christoph2 · Aug 27, 2024 · 1580baf · 1580baf
1 parent 466573e
commit 1580baf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
@@ -16,8 +16,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest] # , ubuntu-latest
-        cibw_archs: ["auto"]
+        os: [windows-latest, ubuntu-latest, macos-13, macos-14]
+        # cibw_archs: ["x86_64", ""]
         #include:
         #  - os: ubuntu-latest
         #    cibw_archs: "aarch64"
@@ -30,7 +30,7 @@ jobs:
           override: true
           components: rustfmt, clippy
       - name: Build wheel
-        uses: pypa/cibuildwheel@v2.16
+        uses: pypa/cibuildwheel@v2.20
 
       - uses: actions/upload-artifact@v2
         with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,7 +88,10 @@ target_compile_options(cpp_ext PUBLIC "-DEXTENSION_NAME=pyxcp.cpp_ext.cpp_ext")
 target_compile_options(stim PUBLIC "-DEXTENSION_NAME=pyxcp.daq_stim.stim")
 
 add_executable(asamkeydll ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/asamkeydll.c)
-# set_target_properties(MyTarget PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+if (CMAKE_SYSTEM_NAME STREQUAL  "Linux")
+	target_link_libraries(asamkeydll PRIVATE dl)
+endif()
+
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
     # CMAKE_SYSTEM_NAME STREQUAL  "Windows"

diff --git a/pyproject.toml b/pyproject.toml
@@ -162,17 +162,31 @@ exclude = '''
 
 [tool.cibuildwheel]
 build-verbosity = 3
+
 #test-command = "pytest {package}/tests"
 #test-command = "pytest -svv pyxcp/tests"
 build = "cp3{8,9,10,11,12,13}-*"
+manylinux-x86_64-image = "manylinux_2_28"
 skip = ["*-manylinux_i686", "*-musllinux_x86_64", "*-musllinux_i686"] # Skip Linux 32bit and MUSL builds.
 build-frontend = "pip"
 
+[tool.cibuildwheel.macos]
+archs = ["x86_64", "universal2", "arm64"]
+
+[tool.cibuildwheel.windows]
+archs = ["AMD64", "ARM64"]
+
+[[tool.cibuildwheel.overrides]]
+select = "cp3?-*"
+manylinux-x86_64-image = "manylinux2014"
+
+[tool.cibuildwheel.linux]
+archs = ["auto", "aarch64"]
+before-all = "yum install -y libffi openssl openssl-devel"
+
 [tool.pyright]
 include = ["pyxcp", "build_ext.py"]
-ignore = ["pyxcp/conf_test.py", "pyxcp/config_new.py", "pyxcp/config_tr.py", "pyxcp/examples/memxfer.py",
-	"pyxcp/examples/ts_tester.py", "pyxcp/recorder/converter/**", "pyxcp/transport/candriver/**", "pyxcp/recorder/simdjson/**",
-	"pyxcp/recorder/mio/**", "pyxcp/recorder/lz4/**"]
+ignore = ["pyxcp/recorder/converter/**", "pyxcp/recorder/simdjson/**","pyxcp/recorder/mio/**", "pyxcp/recorder/lz4/**"]
 #defineConstant = { DEBUG = true }
 #stubPath = "src/stubs"