Skip to content

Commit fa2d774

Browse files
chore(deps): bump the actions group across 1 directory with 3 updates (#594)
* chore(deps): bump the actions group across 1 directory with 3 updates Bumps the actions group with 3 updates in the / directory: [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action), [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) and [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance). Updates `docker/setup-qemu-action` from 3.4.0 to 3.6.0 - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v3.4.0...v3.6.0) Updates `pypa/cibuildwheel` from 2.22 to 2.23 - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](pypa/cibuildwheel@v2.22...v2.23) Updates `actions/attest-build-provenance` from 2.2.0 to 2.2.3 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](actions/attest-build-provenance@520d128...c074443) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: actions/attest-build-provenance dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions ... Signed-off-by: dependabot[bot] <support@github.com> * fix: find OpenSSL when pkg-config & libssl-dev are present * fix: tests on musllinux_1_2 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mayeut <mayeut@users.noreply.github.com>
1 parent 22aec91 commit fa2d774

File tree

4 files changed

+33
-24
lines changed

4 files changed

+33
-24
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ jobs:
118118
- uses: yezz123/setup-uv@v4
119119

120120
- name: Set up QEMU
121-
uses: docker/setup-qemu-action@v3.4.0
121+
uses: docker/setup-qemu-action@v3.6.0
122122
if: matrix.use_qemu && fromJSON(env.USE_QEMU)
123123

124124
- name: Build wheels
125-
uses: pypa/cibuildwheel@v2.22
125+
uses: pypa/cibuildwheel@v2.23
126126
if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)
127127
env:
128128
CIBW_ARCHS: "${{ matrix.arch }}"
@@ -151,7 +151,7 @@ jobs:
151151
fetch-depth: 0 # required for versioneer to find tags
152152

153153
- name: Build wheels
154-
uses: pypa/cibuildwheel@v2.22
154+
uses: pypa/cibuildwheel@v2.23
155155
env:
156156
CIBW_ARCHS: "${{ matrix.arch }}"
157157
CIBW_BUILD: "cp39-manylinux_*"
@@ -307,7 +307,7 @@ jobs:
307307
path: dist
308308

309309
- name: Generate artifact attestation for sdist and wheel
310-
uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
310+
uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
311311
with:
312312
subject-path: "dist/cmake-*"
313313

CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,13 @@ if(CMakePythonDistributions_SUPERBUILD)
241241
message(STATUS "SuperBuild - CMakeProject-build - OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
242242
endif()
243243

244+
if(DEFINED OPENSSL_USE_STATIC_LIBS)
245+
list(APPEND _cmake_cache_args
246+
-DOPENSSL_USE_STATIC_LIBS:BOOL=${OPENSSL_USE_STATIC_LIBS}
247+
)
248+
message(STATUS "SuperBuild - CMakeProject-build - OPENSSL_USE_STATIC_LIBS: ${OPENSSL_USE_STATIC_LIBS}")
249+
endif()
250+
244251
if(DEFINED CMAKE_CXX_STANDARD)
245252
list(APPEND _cmake_cache_args
246253
-DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD}

pyproject.toml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ test-groups = ["test"]
9999
test-command = "pytest {project}/tests"
100100
build-verbosity = 1
101101
build-frontend = "build[uv]"
102+
config-settings."cmake.define.RUN_CMAKE_TEST" = "ON"
102103
environment = { CMAKE_PYTHON_DIST_FORCE_NINJA_DEP = "1" }
103104
musllinux-x86_64-image = "musllinux_1_1"
104105
musllinux-i686-image = "musllinux_1_1"
@@ -112,37 +113,38 @@ select = "*-macos*"
112113
inherit.environment = "append"
113114
environment = { MACOSX_DEPLOYMENT_TARGET = "10.10" }
114115

115-
[tool.cibuildwheel.linux]
116-
before-all = "./scripts/manylinux-build-and-install-openssl.sh"
117-
118-
[tool.cibuildwheel.config-settings]
119-
"cmake.define.RUN_CMAKE_TEST" = "ON"
120-
121-
[tool.cibuildwheel.linux.config-settings]
122-
"cmake.define.OPENSSL_ROOT_DIR" = "/usr/local/ssl"
123-
"cmake.define.CMAKE_JOB_POOL_COMPILE" = "compile"
124-
"cmake.define.CMAKE_JOB_POOL_LINK" = "link"
125-
"cmake.define.CMAKE_JOB_POOLS" = "compile=4;link=1"
126-
"cmake.define.RUN_CMAKE_TEST" = "ON"
127-
128116
[[tool.cibuildwheel.overrides]]
129-
select = ["*-musllinux_*",]
117+
select = "*-*linux*"
118+
before-all = "./scripts/manylinux-build-and-install-openssl.sh"
119+
inherit.environment = "prepend"
120+
environment = { PKG_CONFIG_PATH = "/usr/local/ssl/lib/pkgconfig" }
121+
inherit.config-settings = "prepend"
130122
config-settings."cmake.define.OPENSSL_ROOT_DIR" = "/usr/local/ssl"
123+
config-settings."cmake.define.OPENSSL_USE_STATIC_LIBS" = "ON"
131124
config-settings."cmake.define.CMAKE_JOB_POOL_COMPILE" = "compile"
132125
config-settings."cmake.define.CMAKE_JOB_POOL_LINK" = "link"
133126
config-settings."cmake.define.CMAKE_JOB_POOLS" = "compile=4;link=1"
134-
config-settings."cmake.define.RUN_CMAKE_TEST" = "ON"
127+
128+
[[tool.cibuildwheel.overrides]]
129+
select = ["*-musllinux_*"]
130+
inherit.config-settings = "append"
135131
# disable some tests
136132
# - BootstrapTest fails with custom OpenSSL and probably does not make much sense for this project
137133
# - ExportImport|RunCMake.install|RunCMake.file-GET_RUNTIME_DEPENDENCIES: c.f. https://discourse.cmake.org/t/cmake-test-suite-failing-on-alpine-linux/5064
138134
config-settings."cmake.define.RUN_CMAKE_TEST_EXCLUDE" = "BootstrapTest|ExportImport|RunCMake.install|RunCMake.RuntimePath|RunCMake.file-GET_RUNTIME_DEPENDENCIES"
139135

136+
[[tool.cibuildwheel.overrides]]
137+
select = ["*-musllinux_armv7l"]
138+
inherit.config-settings = "append"
139+
# disable some tests
140+
# - BootstrapTest fails with custom OpenSSL and probably does not make much sense for this project
141+
# - ExportImport|RunCMake.install|RunCMake.file-GET_RUNTIME_DEPENDENCIES: c.f. https://discourse.cmake.org/t/cmake-test-suite-failing-on-alpine-linux/5064
142+
# - CTestTestFdSetSize fails on gcc14+ with "error: implicit declaration of function 'usleep'""
143+
config-settings."cmake.define.RUN_CMAKE_TEST_EXCLUDE" = "BootstrapTest|CTestTestFdSetSize|ExportImport|RunCMake.install|RunCMake.RuntimePath|RunCMake.file-GET_RUNTIME_DEPENDENCIES"
144+
140145
[[tool.cibuildwheel.overrides]]
141146
select = ["*linux_ppc64le", "*linux_s390x"]
142-
config-settings."cmake.define.OPENSSL_ROOT_DIR" = "/usr/local/ssl"
143-
config-settings."cmake.define.CMAKE_JOB_POOL_COMPILE" = "compile"
144-
config-settings."cmake.define.CMAKE_JOB_POOL_LINK" = "link"
145-
config-settings."cmake.define.CMAKE_JOB_POOLS" = "compile=4;link=1"
147+
inherit.config-settings = "append"
146148
# disable tests on those platforms, QEMU is taking to long for jobs to pass on GHA
147149
config-settings."cmake.define.RUN_CMAKE_TEST" = "OFF"
148150

scripts/manylinux-build-and-install-openssl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ rm -rf ${OPENSSL_ROOT}.tar.gz
4848

4949
# Configure
5050
pushd ${OPENSSL_ROOT}
51-
./config no-shared -fPIC --prefix=/usr/local/ssl --openssldir=/usr/local/ssl > /dev/null
51+
./config no-shared no-tests -fPIC --prefix=/usr/local/ssl --openssldir=/usr/local/ssl > /dev/null
5252

5353
# Build
5454
make -j$(nproc) > /dev/null

0 commit comments

Comments
 (0)