From 4e48464bb3708968e1f15455cc2a11ae3acec3fe Mon Sep 17 00:00:00 2001 From: Alexander Harkness 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 --- Jenkinsfile | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index a4abbd076..5e3097833 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,9 +27,35 @@ pipeline { } } stage("Build") { - steps { - sh 'echo "TODO: Replace Travis here."' + parallel { + stage("gcc") { + environment { + TRAVIS_CUBERITE_BUILD_TYPE = 'Release' + TRAVIS_JOB_NUMBER = "{$env.BUILD_ID}" + CC = "gcc" + CXX = "g++" + } + steps { + sh 'bash ./travisbuild.sh' + } + } + stage("clang") { + environment { + TRAVIS_CUBERITE_BUILD_TYPE = 'Debug' + TRAVIS_JOB_NUMBER = "{$env.BUILD_ID}" + CC = "clang" + CXX = "clang++" + } + steps { + sh 'bash ./travisbuild.sh' + } + } } } } + post { + always { + cleanWs() + } + } } -- cgit v1.2.3