From 4e48464bb3708968e1f15455cc2a11ae3acec3fe Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Thu, 17 Jun 2021 08:31:29 +0000
Subject: Move More CI into Jenkins - Travis Migration Progress (#5241)

* Add build stage to Jenkinsfile

* Run travisbuild in bash rather than sh

* Add GCC/Clang differentiation

* Use different working directory for each build type.

* Correct directory name

* Remove travis config file

* Always clean workspace afterwards
---
 travisbuild.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'travisbuild.sh')

diff --git a/travisbuild.sh b/travisbuild.sh
index 9b93e35e8..712f4e2c4 100755
--- a/travisbuild.sh
+++ b/travisbuild.sh
@@ -1,4 +1,4 @@
- #!/usr/bin/env bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -20,9 +20,13 @@ if [ `which ccache` ]; then
 	ccache --zero-stats
 fi
 
+workdir="$CC"_"$TRAVIS_CUBERITE_BUILD_TYPE"
+mkdir "$workdir"
+cd "$workdir"
+
 # Work around a Clang + ccache issue with failing builds by disabling
 # precompiled headers. Turn off LTO for faster build speeds
-cmake . -DCMAKE_BUILD_TYPE=${TRAVIS_CUBERITE_BUILD_TYPE} \
+cmake .. -DCMAKE_BUILD_TYPE=${TRAVIS_CUBERITE_BUILD_TYPE} \
         -DBUILD_TOOLS=Yes \
         -DPRECOMPILE_HEADERS=No \
         -DSELF_TEST=Yes \
@@ -31,7 +35,7 @@ cmake . -DCMAKE_BUILD_TYPE=${TRAVIS_CUBERITE_BUILD_TYPE} \
         ${CACHE_ARGS};
 
 echo "Building..."
-cmake --build . --parallel 2;
+cmake --build . --parallel 3;
 
 if [ `which ccache` ]; then
 	echo "Built with ccache, outputting cache stats..."
-- 
cgit v1.2.3