Skip to content

Commit 5ed68ac

Browse files
Fix cibuildwheel build configuration for manylinux_2_28 compatibility
- Add --plat manylinux_2_28_x86_64 flag to auditwheel repair command - Add CONDA_PREFIX environment variable for pixi build environment - Rename wheel-related pixi tasks to consistent wheel_* naming convention - build_wheels -> wheel_build_cibw - build_pypi_wheel -> wheel_build - build_pypi_repair -> wheel_repair - check_pypi -> wheel_check - test_pypi_wheel -> wheel_test - publish_pypi -> wheel_publish - publish_pypi_test -> wheel_publish_testpypi This addresses GitHub issue #847 for manylinux_2_28 wheel compatibility to support older Ubuntu (20.04) and Google Colab environments.
1 parent 0f808ab commit 5ed68ac

File tree

6 files changed

+1262
-115
lines changed

6 files changed

+1262
-115
lines changed

.github/workflows/cibuildwheel.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
run: |
5353
pixi install -e default
5454
echo "CMAKE_PREFIX_PATH=$PWD/.pixi/envs/default" >> $GITHUB_ENV
55+
echo "CONDA_PREFIX=$PWD/.pixi/envs/default" >> $GITHUB_ENV
5556
shell: bash
5657

5758
- name: Build wheels

CMakeLists.txt

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,21 @@ find_package(urdfdom CONFIG REQUIRED)
128128

129129
if(MOMENTUM_BUILD_RENDERER)
130130
find_package(Kokkos CONFIG REQUIRED) # For mdspan headers (vendored in Kokkos)
131-
endif()
132-
133-
if(MOMENTUM_USE_SYSTEM_RERUN_CPP_SDK)
134-
find_package(rerun_sdk CONFIG REQUIRED)
135-
else()
136-
include(FetchContent)
137-
FetchContent_Declare(rerun_sdk
138-
URL https://github.com/rerun-io/rerun/releases/download/0.23.3/rerun_cpp_sdk.zip
139-
)
140-
FetchContent_MakeAvailable(rerun_sdk)
131+
if(MOMENTUM_USE_SYSTEM_RERUN_CPP_SDK)
132+
find_package(rerun_sdk CONFIG REQUIRED)
133+
else()
134+
include(FetchContent)
135+
FetchContent_Declare(
136+
rerun_sdk
137+
GIT_REPOSITORY https://github.com/rerun-io/rerun.git
138+
GIT_TAG 0.20.3
139+
)
140+
# Disable Rerun tests and examples to speed up build
141+
set(RERUN_BUILD_TESTING OFF CACHE BOOL "" FORCE)
142+
set(RERUN_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
143+
set(RERUN_BUILD_WEB_VIEWER OFF CACHE BOOL "" FORCE)
144+
FetchContent_MakeAvailable(rerun_sdk)
145+
endif()
141146
endif()
142147

143148
# Workaround for Arrow build failure in cibuildwheel

0 commit comments

Comments
 (0)