[trafficserver-ci] branch main updated: environment: set CONFIG_SHELL to /bin/bash and M4 to /bin/m4 if found

[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 37bdc1d  environment: set CONFIG_SHELL to /bin/bash and M4 to /bin/m4 if found
     new 38a1eb4  Merge pull request #96 from traeak/branch_config_shell
37bdc1d is described below

commit 37bdc1df1efe8ff3fb1b3697486f24ad77dc71e3
Author: Brian Olsen <br...@comcast.com>
AuthorDate: Fri Apr 29 15:29:04 2022 +0000

    environment: set CONFIG_SHELL to /bin/bash and M4 to /bin/m4 if found
---
 jenkins/bin/environment.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/jenkins/bin/environment.sh b/jenkins/bin/environment.sh
index 491e6f2..4c336b0 100755
--- a/jenkins/bin/environment.sh
+++ b/jenkins/bin/environment.sh
@@ -124,12 +124,20 @@ $CC -v
 echo "CXX: $CXX"
 $CXX -v
 
+if [ -x "/bin/bash" ]; then
+  export CONFIG_SHELL=/bin/bash
+fi
+
+if [ -x "/bin/m4" ]; then
+  export M4=/bin/m4
+fi
+
 # Figure out parallelism for regular builds / bots
 export ATS_MAKE_FLAGS="-j4"
 if [ "yes" == "$IS_DOCKER" ]; then
-    export ATS_BUILD_BASEDIR="${WORKSPACE}"
+  export ATS_BUILD_BASEDIR="${WORKSPACE}"
 else
-    export ATS_BUILD_BASEDIR="${WORKSPACE}/${BUILD_NUMBER}"
+  export ATS_BUILD_BASEDIR="${WORKSPACE}/${BUILD_NUMBER}"
 fi
 
 # sanitizer environment