From d8492c069254150ba9a097954afa1391d02c5cea Mon Sep 17 00:00:00 2001 From: 0vercl0k <1476421+0vercl0k@users.noreply.github.com> Date: Sun, 5 Oct 2025 09:25:42 -0700 Subject: [PATCH 1/2] ci, abi3 --- .github/workflows/kdmp-parser.yml | 23 ++++++++++------------- src/python/CMakeLists.txt | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/kdmp-parser.yml b/.github/workflows/kdmp-parser.yml index d54698b..3c2c1e1 100644 --- a/.github/workflows/kdmp-parser.yml +++ b/.github/workflows/kdmp-parser.yml @@ -35,16 +35,14 @@ jobs: matrix: variant: # Available runners: https://github.com/actions/runner-images - - {os: windows-2019, generator: msvc, arch: x64, config: RelWithDebInfo, } - - {os: windows-2019, generator: msvc, arch: win32, config: RelWithDebInfo, } + - {os: windows-2025, generator: msvc, arch: x64, config: RelWithDebInfo, } + - {os: windows-2025, generator: msvc, arch: win32, config: RelWithDebInfo, } - {os: ubuntu-22.04, generator: gcc, arch: x64, config: RelWithDebInfo, } - {os: ubuntu-22.04, generator: clang, arch: x64, config: RelWithDebInfo, } - {os: ubuntu-24.04, generator: gcc, arch: x64, config: RelWithDebInfo, } - {os: ubuntu-24.04, generator: clang, arch: x64, config: RelWithDebInfo, } - - {os: macos-13, generator: clang, arch: x64, config: Release, } - # - {os: macos-13-xlarge, generator: clang, arch: arm64, config: Release, } # Paying runner - - {os: macos-14, generator: clang, arch: arm64, config: Release, } - # - {os: macos-14-large, generator: clang, arch: x64, config: Release, } # Paying runner + - {os: macos-15-intel, generator: clang, arch: x64, config: Release, } + - {os: macos-15, generator: clang, arch: arm64, config: Release, } runs-on: ${{ matrix.variant.os }} name: parser / ${{ matrix.variant.os }} / ${{ matrix.variant.generator }} / ${{ matrix.variant.arch }} env: @@ -53,7 +51,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Retrieve testdatas uses: actions/download-artifact@v4 @@ -113,17 +111,16 @@ jobs: matrix: variant: # Available runners: https://github.com/actions/runner-images - - {os: windows-2019, config: RelWithDebInfo } - - {os: ubuntu-22.04, config: RelWithDebInfo } - # most up to date free intel based osx? - - {os: macos-13, config: Release } + - {os: windows-2025, config: RelWithDebInfo } + - {os: ubuntu-22.04, config: RelWithDebInfo } + - {os: macos-15-intel, config: Release } runs-on: ${{ matrix.variant.os }} name: bindings / ${{ matrix.variant.os }} env: CMAKE_FLAGS: "-DBUILD_PARSER:BOOL=OFF -DBUILD_TESTS:BOOL=OFF -DBUILD_PYTHON_BINDING:BOOL=ON" steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Retrieve testdatas uses: actions/download-artifact@v4 @@ -132,7 +129,7 @@ jobs: path: . - name: Build / test wheels - uses: pypa/cibuildwheel@v2.19.1 + uses: pypa/cibuildwheel@v3.2.0 env: CIBW_BEFORE_TEST: pip install -U -r {project}/src/python/tests/requirements.txt with: diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 78f98bd..9cf3f92 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -40,7 +40,7 @@ list(APPEND CMAKE_PREFIX_PATH "${NB_DIR}") find_package(nanobind CONFIG REQUIRED) -nanobind_add_module(_kdmp_parser NB_STATIC src/kdmp_parser.cc) +nanobind_add_module(_kdmp_parser STABLE_ABI src/kdmp_parser.cc) if(BUILD_PYTHON_PACKAGE) # From 7501d2af7a110e7163e8aec810dfef6cc3655896 Mon Sep 17 00:00:00 2001 From: 0vercl0k <1476421+0vercl0k@users.noreply.github.com> Date: Sun, 5 Oct 2025 09:34:12 -0700 Subject: [PATCH 2/2] fix --- src/python/pyproject.toml | 1 - src/python/src/kdmp_parser.cc | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/pyproject.toml b/src/python/pyproject.toml index 7ed8f84..603017c 100644 --- a/src/python/pyproject.toml +++ b/src/python/pyproject.toml @@ -38,7 +38,6 @@ cmake.args = ["-DBUILD_PYTHON_PACKAGE:BOOL=ON"] [tool.cibuildwheel] build-verbosity = 1 -skip = "cp37-* pp* *musllinux*" test-command = "pytest -vvv {project}/src/python/tests" [tool.cibuildwheel.macos.environment] diff --git a/src/python/src/kdmp_parser.cc b/src/python/src/kdmp_parser.cc index 0c4f61d..8de6d7e 100644 --- a/src/python/src/kdmp_parser.cc +++ b/src/python/src/kdmp_parser.cc @@ -9,6 +9,7 @@ #include "kdmp-parser.h" +#include #include #include #include