Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into CLIENT-3205-mrt-update…
Browse files Browse the repository at this point in the history
…-err-codes
  • Loading branch information
juliannguyen4 committed Dec 6, 2024
2 parents 5dd10ff + 0ab340b commit f096647
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/build-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,17 @@ jobs:
yum install python-setuptools -y
# delvewheel is not enabled by default but we do need to repair the wheel
CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel==1.*"
# We want to check that our new openssl 3 install is used, not the system default
CIBW_REPAIR_WHEEL_COMMAND_LINUX: auditwheel repair -w {dest_dir} {wheel} && auditwheel show {dest_dir}/*
# We want to check that our wheel links to the new openssl 3 install, not the system default
# This assumes that ldd prints out the "soname" for the libraries
# We can also manually verify the repair worked by checking the repaired wheel's compatibility tag
CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
WHEEL_DIR=wheel-contents &&
unzip {wheel} -d $WHEEL_DIR &&
ldd $WHEEL_DIR/*.so | awk '{print $1}' | grep libssl.so.3 &&
ldd $WHEEL_DIR/*.so | awk '{print $1}' | grep libcrypto.so.3 &&
auditwheel repair -w {dest_dir} {wheel} &&
auditwheel show {dest_dir}/* &&
rm -rf $WHEEL_DIR
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path ./aerospike-client-c/vs/x64/Release -w {dest_dir} {wheel}"
CIBW_TEST_COMMAND: ${{ env.TEST_COMMAND }}

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/manylinux2014-openssl.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ LABEL com.aerospike.clients.openssl-version=$OPENSSL_VERSION

RUN yum install -y perl-core wget

WORKDIR /
ARG OPENSSL_TAR_NAME=openssl-$OPENSSL_VERSION
RUN wget https://www.openssl.org/source/$OPENSSL_TAR_NAME.tar.gz
RUN tar xzvf $OPENSSL_TAR_NAME.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.0.0rc2
16.0.0rc3.dev1

0 comments on commit f096647

Please sign in to comment.