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

chore: fix OpenSSL root dir #285

Closed
wants to merge 3 commits into from
Closed

chore: fix OpenSSL root dir #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75382c5
chore: pin boost 1.82 on mac
cwaldren-ld Nov 3, 2023
405f750
broken BOOST_ROOT env variable on mac
cwaldren-ld Nov 3, 2023
cea1292
OpenSSL step wasn't actually setting OPENSSL_ROOT_DIR
cwaldren-ld Nov 4, 2023
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
2 changes: 1 addition & 1 deletion .github/actions/install-boost/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ runs:
shell: bash
run: |
brew install boost
echo "BOOST_ROOT=$(boost --prefix boost@1.82)" >> $GITHUB_OUTPUT
echo "BOOST_ROOT=$(brew --prefix boost)" >> $GITHUB_OUTPUT

- name: Determine root
id: determine-root
Expand Down
24 changes: 22 additions & 2 deletions .github/actions/install-openssl/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ runs:
# The Mac runner already has OpenSSL > 3 via brew, but we need to expose its
# install path to CMake.
- name: Install for Mac
id: brew-action
if: runner.os == 'macOS'
shell: bash
run: echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> "$GITHUB_ENV"
run: |
echo "OpenSSL Prefix: $(brew --prefix openssl@3)"
echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)" >> "$GITHUB_ENV"

# The Windows runner has an older version of OpenSSL and needs to be upgraded.
# Additionally it seems to randomly be installed in OpenSSL-Win64 or OpenSSL depending on
# Additionally, it seems to randomly be installed in OpenSSL-Win64 or OpenSSL depending on
# the runner Github gives us.
- name: Install for Windows
id: choco-action
if: runner.os == 'Windows'
shell: bash
run: |
Expand All @@ -30,3 +34,19 @@ runs:
else
echo "OPENSSL_ROOT_DIR=C:\Program Files\OpenSSL" >> "$GITHUB_ENV"
fi

- name: Determine root
id: determine-root
shell: bash
run: |
if [ ! -z "$ROOT_CHOCO" ]; then
echo "OPENSSL_ROOT_DIR=$ROOT_CHOCO" >> $GITHUB_OUTPUT
echo Setting OPENSSL_ROOT_DIR to "$ROOT_CHOCO"
elif [ ! -z "$ROOT_BREW" ]; then
echo "OPENSSL_ROOT_DIR=$ROOT_BREW" >> $GITHUB_OUTPUT
echo Setting OPENSSL_ROOT_DIR to "$ROOT_BREW"
fi

env:
ROOT_CHOCO: ${{ steps.choco-action.outputs.OPENSSL_ROOT_DIR }}
ROOT_BREW: ${{ steps.brew-action.outputs.OPENSSL_ROOT_DIR }}
Loading