From efd575611df262f0f6022214c1d7b15bd631b2a3 Mon Sep 17 00:00:00 2001 From: XanthosXanthopoulos Date: Wed, 20 Nov 2024 17:24:42 +0200 Subject: [PATCH] display installed toolsets [skip ci] --- .github/workflows/python-packaging.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-packaging.yml b/.github/workflows/python-packaging.yml index 59d60f05de..6c79e85806 100644 --- a/.github/workflows/python-packaging.yml +++ b/.github/workflows/python-packaging.yml @@ -98,12 +98,18 @@ jobs: CIBW_BUILD: ${{ matrix.cibw_build }} CIBW_BUILD_VERBOSITY: 1 CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 - CIBW_BEFORE_BUILD: ls /usr/bin; gcc-13 --version; bash -x -c 'rm -rf tiledbsoma*/dist_links/dist/lib*' + CIBW_BEFORE_BUILD_LINUX: yum -y remove gcc-toolset-12\*; yum -y install gcc-toolset-13; ls /opt/rh/gcc-toolset-13/root/usr/bin/; bash -x -c 'rm -rf tiledbsoma*/dist_links/dist/lib*' + # ^ Delete lib folder that apis/python/setup.py:find_or_build() looks for in deciding to + # run CMake build or not. Otherwise it'll keep reusing the library file built in the + # first iteration of cibuildwheel's outer loop, resulting in wheels with the library + # built for the wrong python version. + CIBW_BEFORE_BUILD: bash -x -c 'rm -rf tiledbsoma*/dist_links/dist/lib*' # ^ Delete lib folder that apis/python/setup.py:find_or_build() looks for in deciding to # run CMake build or not. Otherwise it'll keep reusing the library file built in the # first iteration of cibuildwheel's outer loop, resulting in wheels with the library # built for the wrong python version. CIBW_ARCHS_MACOS: ${{ matrix.cibw_archs_macos }} + CIBW_ENVIRONMENT_LINUX : CC=/opt/rh/gcc-toolset-13/root/usr/bin/gcc CIBW_TEST_SKIP: "*_arm64" CMAKE_OSX_ARCHITECTURES: ${{ matrix.cibw_archs_macos }} MACOSX_DEPLOYMENT_TARGET: "11.0"