Fix openssl on mac_ci.yml (#633)

MisterTea · Apr 30, 2024 · e30bd60 · e30bd60
1 parent fe383c3
commit e30bd60
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/mac_ci.yml b/.github/workflows/mac_ci.yml
@@ -17,7 +17,7 @@ jobs:
         run: |
           mkdir -p ~/.ssh/
           echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-          brew install cmake ninja; brew install openssl protobuf libsodium
+          brew install cmake ninja; brew install protobuf libsodium
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
           git submodule sync --recursive
           git submodule update --init --force --recursive
@@ -46,7 +46,7 @@ jobs:
         run: |
           mkdir build
           pushd build
-          cmake -DSANITIZE_UNDEFINED=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib ../
+          cmake -DSANITIZE_UNDEFINED=ON ../
           make -j`nproc`
           TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
@@ -65,7 +65,7 @@ jobs:
           git submodule update --init --force --recursive
           mkdir -p ~/.ssh/
           echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-          brew install cmake ninja; brew install openssl protobuf libsodium
+          brew install cmake ninja; brew install protobuf libsodium
 
       # Restore both vcpkg and its artifacts from the GitHub cache service.
       - name: Restore vcpkg and its artifacts.
@@ -90,7 +90,7 @@ jobs:
         run: |
           mkdir build
           pushd build
-          cmake -DSANITIZE_ADDRESS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib ../
+          cmake -DSANITIZE_ADDRESS=ON ../
           make -j`nproc`
           TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
@@ -109,7 +109,7 @@ jobs:
           git submodule update --init --force --recursive
           mkdir -p ~/.ssh/
           echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-          brew install cmake ninja; brew install openssl protobuf libsodium
+          brew install cmake ninja; brew install protobuf libsodium
 
       # Restore both vcpkg and its artifacts from the GitHub cache service.
       - name: Restore vcpkg and its artifacts.
@@ -134,7 +134,7 @@ jobs:
         run: |
           mkdir build
           pushd build
-          cmake -DSANITIZE_MEMORY=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib ../
+          cmake -DSANITIZE_MEMORY=ON ../
           make -j`nproc`
           TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
@@ -153,7 +153,7 @@ jobs:
           git submodule update --init --force --recursive
           mkdir -p ~/.ssh/
           echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-          brew install cmake ninja; brew install openssl protobuf libsodium
+          brew install cmake ninja; brew install protobuf libsodium
 
       # Restore both vcpkg and its artifacts from the GitHub cache service.
       - name: Restore vcpkg and its artifacts.
@@ -178,7 +178,7 @@ jobs:
         run: |
           mkdir build
           pushd build
-          cmake -DSANITIZE_THREAD=ON -DSANITIZE_LINK_STATIC=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib ../
+          cmake -DSANITIZE_THREAD=ON -DSANITIZE_LINK_STATIC=ON ../
           make -j`nproc`
           TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd