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 f92b26f m1 fix, remove toolset-8/9 from consideration
new 7ae5c62 Merge pull request #268 from traeak/rhel_gcc10
f92b26f is described below
commit f92b26f208f8d78a805793872fc8e47ddc486fe6
Author: Brian Olsen <[email protected]>
AuthorDate: Thu Oct 26 11:01:05 2023 -0600
m1 fix, remove toolset-8/9 from consideration
---
jenkins/bin/environment.sh | 12 +++---------
jenkins/branch/osx-m1.pipeline | 2 --
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/jenkins/bin/environment.sh b/jenkins/bin/environment.sh
index 305b9df..3b644d4 100755
--- a/jenkins/bin/environment.sh
+++ b/jenkins/bin/environment.sh
@@ -107,16 +107,10 @@ else
# Default is gcc / g++
export CC=gcc
export CXX=g++
- if test -f "/opt/rh/devtoolset-8/enable"; then
- # This changes the path such that gcc / g++ is the right version. This
is for CentOS 6 / 7.
- source /opt/rh/devtoolset-8/enable
- echo "Enabling devtoolset-8"
- elif test -f "/opt/rh/devtoolset-9/enable"; then
- # This changes the path such that gcc / g++ is the right version. This
is for CentOS 6 / 7.
- source /opt/rh/devtoolset-9/enable
- echo "Enabling devtoolset-9"
+ if test -f "/opt/rh/devtoolset-10/enable"; then
+ source /opt/rh/devtoolset-10/enable
+ echo "Enabling devtoolset-10"
elif test -f "/opt/rh/gcc-toolset-11/enable"; then
- # This changes the path such that gcc / g++ is the right version. This
is for Rockylinux 8
source /opt/rh/gcc-toolset-11/enable
echo "Enabling gcc-toolset-11"
elif test -x "/usr/bin/g++-9"; then
diff --git a/jenkins/branch/osx-m1.pipeline b/jenkins/branch/osx-m1.pipeline
index 4994f2f..6feb2e3 100644
--- a/jenkins/branch/osx-m1.pipeline
+++ b/jenkins/branch/osx-m1.pipeline
@@ -35,7 +35,6 @@ pipeline {
CXXFLAGS="-Qunused-arguments" \
WITH_LIBCPLUSPLUS="yes"
\
cmake -B build \
- --preset ci \
-G "Unix
Makefiles" \
-DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl
cmake --build build -j3 -v
@@ -46,7 +45,6 @@ pipeline {
CXXFLAGS="-Qunused-arguments" \
WITH_LIBCPLUSPLUS="yes"
\
./configure \
-
--enable-experimental-plugins \
--with-openssl=/opt/homebrew/opt/openssl
make -j3
fi
