You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2023/10/26 16:33:39 UTC
[trafficserver-ci] branch main updated: revert location of openssl to homebrew loc
This is an automated email from the ASF dual-hosted git repository.
bnolsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push:
new 6687afe revert location of openssl to homebrew loc
new 2a6dd51 Merge pull request #267 from traeak/m1_ssl
6687afe is described below
commit 6687afe8cb7a845fb8c6dcf06d61e3b51254bad1
Author: Brian Olsen <bn...@gmail.com>
AuthorDate: Thu Oct 26 10:33:10 2023 -0600
revert location of openssl to homebrew loc
---
jenkins/branch/osx-m1.pipeline | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/jenkins/branch/osx-m1.pipeline b/jenkins/branch/osx-m1.pipeline
index c2befc2..4994f2f 100644
--- a/jenkins/branch/osx-m1.pipeline
+++ b/jenkins/branch/osx-m1.pipeline
@@ -30,29 +30,24 @@ pipeline {
if [ -d cmake ]
then
- export CC="clang"
- export CXX="clang++"
- export CXXFLAGS="-Qunused-arguments"
- export WITH_LIBCPLUSPLUS="yes"
- cmake -B build \
+ CC="clang" \
+ CXX="clang++" \
+ CXXFLAGS="-Qunused-arguments" \
+ WITH_LIBCPLUSPLUS="yes" \
+ cmake -B build \
+ --preset ci \
-G "Unix Makefiles" \
- -DCMAKE_BUILD_TYPE=Debug \
- -DCMAKE_INSTALL_PREFIX=/tmp/ats" \
- -DENABLE_CCACHE=ON" \
- -DBUILD_EXPERIMENTAL_PLUGINS=ON" \
- -DBUILD_REGRESSION_TESTING=ON" \
- -DENABLE_EXAMPLE=ON \
- -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
- cmake --build build -j3 -v
+ -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl
+ cmake --build build -j3 -v
else
autoreconf -fiv
- export CC="clang"
- export CXX="clang++"
- export CXXFLAGS="-Qunused-arguments"
- export WITH_LIBCPLUSPLUS="yes"
+ CC="clang" \
+ CXX="clang++" \
+ CXXFLAGS="-Qunused-arguments" \
+ WITH_LIBCPLUSPLUS="yes" \
./configure \
--enable-experimental-plugins \
- --with-openssl=/usr/local/opt/openssl
+ --with-openssl=/opt/homebrew/opt/openssl
make -j3
fi
'''