Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CLIENT-2217] macOS wheels: update OpenSSL dependency from 1.1.1 to 3 #471

Merged
merged 7 commits into from
Nov 1, 2024
Merged

[CLIENT-2217] macOS wheels: update OpenSSL dependency from 1.1.1 to 3 #471

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de6779c
update
juliannguyen4 Oct 1, 2024
109035d
show external libs
juliannguyen4 Oct 29, 2024
2170a10
use env var
juliannguyen4 Oct 31, 2024
3d3c669
update docs
juliannguyen4 Oct 31, 2024
351d05f
undo because this is not related to pr
juliannguyen4 Nov 1, 2024
d7b0732
Merge remote-tracking branch 'origin/dev' into CLIENT-2217-openssl3
juliannguyen4 Nov 1, 2024
91aa9e8
Update BUILD.md
juliannguyen4 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build-wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ jobs:
runs-on: ${{ needs.get-runner-os.outputs.runner-os }}
env:
BUILD_IDENTIFIER: "${{ matrix.python-tag }}-${{ inputs.platform-tag }}"
MACOS_OPENSSL_VERSION: 3
steps:
- name: Create status check message
run: echo STATUS_CHECK_MESSAGE="cibuildwheel (${{ env.BUILD_IDENTIFIER }})" >> $GITHUB_ENV
Expand Down Expand Up @@ -241,7 +242,7 @@ jobs:
uses: pypa/cibuildwheel@v2.20.0
env:
CIBW_ENVIRONMENT_PASS_LINUX: ${{ inputs.unoptimized && 'UNOPTIMIZED' || '' }}
CIBW_ENVIRONMENT_MACOS: SSL_LIB_PATH="$(brew --prefix openssl@1.1)/lib/" CPATH="$(brew --prefix openssl@1.1)/include/" STATIC_SSL=1
CIBW_ENVIRONMENT_MACOS: SSL_LIB_PATH="$(brew --prefix openssl@${{ env.MACOS_OPENSSL_VERSION }})/lib/" CPATH="$(brew --prefix openssl@${{ env.MACOS_OPENSSL_VERSION }})/include/" STATIC_SSL=1
CIBW_BUILD: ${{ env.BUILD_IDENTIFIER }}
CIBW_BUILD_FRONTEND: build
CIBW_BEFORE_ALL_LINUX: >
Expand Down
7 changes: 3 additions & 4 deletions BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ By default macOS will be missing command line tools.

The dependencies can be installed through the macOS package manager [Homebrew](http://brew.sh/).

brew install openssl@1
# brew uninstall openssl@3
brew uninstall openssl@3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you mean 'install', not 'uninstall'?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed


### All distros

Expand All @@ -109,8 +108,8 @@ using the wrong version of the C client. This can causes strange issues when bui
Also, for macOS or any other operating system that doesn't have OpenSSL installed by default, you must install it and
specify its location when building the wheel. In macOS, you would run these commands:
```
export SSL_LIB_PATH="$(brew --prefix openssl@1.1)/lib/"
export CPATH="$(brew --prefix openssl@1.1)/include/"
export SSL_LIB_PATH="$(brew --prefix openssl@3)/lib/"
export CPATH="$(brew --prefix openssl@3)/include/"
export STATIC_SSL=1
```

Expand Down
Loading