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 ec4367f jenkins/bin/environment.sh: add detection for devtoolset-8
new e21198d Merge pull request #167 from traeak/devtoolset-8
ec4367f is described below
commit ec4367fef254b5701158f10e3d9be71d9f62eecc
Author: Brian Olsen <[email protected]>
AuthorDate: Fri May 19 15:12:28 2023 +0000
jenkins/bin/environment.sh: add detection for devtoolset-8
---
jenkins/bin/environment.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/jenkins/bin/environment.sh b/jenkins/bin/environment.sh
index 156afb3..436b279 100755
--- a/jenkins/bin/environment.sh
+++ b/jenkins/bin/environment.sh
@@ -105,7 +105,11 @@ else
# Default is gcc / g++
export CC=gcc
export CXX=g++
- if test -f "/opt/rh/devtoolset-9/enable"; then
+ 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"
