parent
1d1fa91401
commit
4bb359f067
14
Jenkinsfile
vendored
14
Jenkinsfile
vendored
@ -21,7 +21,7 @@ pipeline {
|
||||
}
|
||||
stage("clang-tidy") {
|
||||
steps {
|
||||
sh './clang-tidy.sh -j 3'
|
||||
sh './clang-tidy.sh -j 4'
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -30,24 +30,24 @@ pipeline {
|
||||
parallel {
|
||||
stage("gcc") {
|
||||
environment {
|
||||
TRAVIS_CUBERITE_BUILD_TYPE = 'Release'
|
||||
TRAVIS_JOB_NUMBER = "{$env.BUILD_ID}"
|
||||
CI_CUBERITE_BUILD_TYPE = 'Release'
|
||||
CI_JOB_NUMBER = "{$env.BUILD_ID}"
|
||||
CC = "gcc"
|
||||
CXX = "g++"
|
||||
}
|
||||
steps {
|
||||
sh 'bash ./travisbuild.sh'
|
||||
sh 'bash ./cibuild.sh'
|
||||
}
|
||||
}
|
||||
stage("clang") {
|
||||
environment {
|
||||
TRAVIS_CUBERITE_BUILD_TYPE = 'Debug'
|
||||
TRAVIS_JOB_NUMBER = "{$env.BUILD_ID}"
|
||||
CI_CUBERITE_BUILD_TYPE = 'Debug'
|
||||
CI_JOB_NUMBER = "{$env.BUILD_ID}"
|
||||
CC = "clang"
|
||||
CXX = "clang++"
|
||||
}
|
||||
steps {
|
||||
sh 'bash ./travisbuild.sh'
|
||||
sh 'bash ./cibuild.sh'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
set -e
|
||||
|
||||
export CUBERITE_BUILD_SERIES_NAME="Travis $CC $TRAVIS_CUBERITE_BUILD_TYPE"
|
||||
export CUBERITE_BUILD_ID=$TRAVIS_JOB_NUMBER
|
||||
export CUBERITE_BUILD_SERIES_NAME="CI $CC $CI_CUBERITE_BUILD_TYPE"
|
||||
export CUBERITE_BUILD_ID=$CI_JOB_NUMBER
|
||||
export CUBERITE_BUILD_DATETIME=`date`
|
||||
|
||||
# Use ccache if available
|
||||
@ -20,17 +20,17 @@ if [ `which ccache` ]; then
|
||||
ccache --zero-stats
|
||||
fi
|
||||
|
||||
workdir="$CC"_"$TRAVIS_CUBERITE_BUILD_TYPE"
|
||||
workdir="$CC"_"$CI_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=${CI_CUBERITE_BUILD_TYPE} \
|
||||
-DBUILD_TOOLS=Yes \
|
||||
-DPRECOMPILE_HEADERS=No \
|
||||
-DSELF_TEST=Yes \
|
||||
-DUNITY_BUILDS=${TRAVIS_CUBERITE_UNITY_BUILDS-Yes} \
|
||||
-DUNITY_BUILDS=${CI_CUBERITE_UNITY_BUILDS-Yes} \
|
||||
-DWHOLE_PROGRAM_OPTIMISATION=No \
|
||||
${CACHE_ARGS};
|
||||
|
||||
@ -47,7 +47,7 @@ ctest --output-on-failure --parallel 2;
|
||||
|
||||
cd Server/;
|
||||
touch apiCheckFailed.flag
|
||||
if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then
|
||||
if [ "$CI_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then
|
||||
./Cuberite <<- EOF
|
||||
load APIDump
|
||||
apicheck
|
Loading…
Reference in New Issue
Block a user