File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -20,18 +20,21 @@ jobs:
2020 - name : Install Dependencies
2121 shell : bash
2222 run : |
23- brew install openssl gflags googletest gsasl
23+ brew install openssl@3 gflags googletest gsasl
2424
2525 - name : Build
2626 run : |
27+ export OPENSSL_TOP=$(brew --prefix openssl@3)
28+ export OPENSSL_VERSION=$(ls -1 $OPENSSL_TOP | grep -E '^[0-9]' | head -1)
29+ export OPENSSL_DIR="$OPENSSL_TOP/$OPENSSL_VERSION"
2730 cmake -B ${{github.workspace}}/build \
2831 -D PHOTON_CXX_STANDARD=17 \
2932 -D PHOTON_ENABLE_ECOSYSTEM=ON \
3033 -D PHOTON_BUILD_TESTING=ON \
3134 -D CMAKE_BUILD_TYPE=MinSizeRel \
3235 -D PHOTON_ENABLE_SASL=ON \
3336 -D PHOTON_ENABLE_LIBCURL=ON \
34- -D OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@3/3.6.0
37+ -D OPENSSL_ROOT_DIR=${OPENSSL_DIR}
3538 cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)
3639
3740 - name : Test
Original file line number Diff line number Diff line change @@ -20,18 +20,25 @@ jobs:
2020 - name : Install Dependencies
2121 shell : bash
2222 run : |
23+ <<<<<<< HEAD
2324 brew install openssl gflags googletest gsasl nasm
25+ =======
26+ brew install openssl@3 gflags googletest gsasl nasm
27+ >>>>>>> be8e6af (Fix macos CI finding openssl dep (#1134))
2428
2529 - name : Build
2630 run : |
31+ export OPENSSL_TOP=$(brew --prefix openssl@3)
32+ export OPENSSL_VERSION=$(ls -1 $OPENSSL_TOP | grep -E '^[0-9]' | head -1)
33+ export OPENSSL_DIR="$OPENSSL_TOP/$OPENSSL_VERSION"
2734 cmake -B ${{github.workspace}}/build \
2835 -D PHOTON_CXX_STANDARD=17 \
2936 -D PHOTON_ENABLE_ECOSYSTEM=ON \
3037 -D PHOTON_BUILD_TESTING=ON \
3138 -D CMAKE_BUILD_TYPE=MinSizeRel \
3239 -D PHOTON_ENABLE_SASL=ON \
3340 -D PHOTON_ENABLE_LIBCURL=ON \
34- -D OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@3/3.6.0
41+ -D OPENSSL_ROOT_DIR=${OPENSSL_DIR}
3542 cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)
3643
3744 - name : Test
You can’t perform that action at this time.
0 commit comments