[trafficserver-ci] branch main updated: environment from devtoolset-7 to devtoolset-9

[bn...@apache.org]

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 9dfd678  environment from devtoolset-7 to devtoolset-9
     new a49da15  Merge pull request #42 from traeak/devtoolset-9
9dfd678 is described below

commit 9dfd678813d2ff607fd2fa0d40bc9cf03585056c
Author: Brian Olsen <bn...@gmail.com>
AuthorDate: Mon Aug 23 08:23:06 2021 -0700

    environment from devtoolset-7 to devtoolset-9
---
 jenkins/bin/environment.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/jenkins/bin/environment.sh b/jenkins/bin/environment.sh
index 4e007c2..a1a617e 100755
--- a/jenkins/bin/environment.sh
+++ b/jenkins/bin/environment.sh
@@ -94,7 +94,7 @@ if [ "1" == "$enable_clang" ]; then
     export CXXFLAGS="-Qunused-arguments"
     export WITH_LIBCPLUSPLUS="yes"
 elif [ "1" == "$enable_icc" ]; then
-    source /opt/rh/devtoolset-7/enable
+    source /opt/rh/devtoolset-9/enable
     source /opt/intel/bin/iccvars.sh intel64
     export CC=icc
     export CXX=icpc
@@ -102,14 +102,14 @@ else
     # Default is gcc / g++
     export CC=gcc
     export CXX=g++
-    if test -f "/opt/rh/devtoolset-7/enable"; then
+    if 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-7/enable
-        echo "Enabling devtoolset-7"
-    elif test -x "/usr/bin/g++-7"; then
+        source /opt/rh/devtoolset-9/enable
+        echo "Enabling devtoolset-9"
+    elif test -x "/usr/bin/g++-9"; then
         # This is for Debian platforms
-        export CC=/usr/bin/gcc-7
-        export CXX=/usr/bin/g++-7
+        export CC=/usr/bin/gcc-9
+        export CXX=/usr/bin/g++-9
     fi
 fi