1
0
Fork 0

Update build script names to be more intuitive.

See: e77a4ab46d
This commit is contained in:
Alexander Harkness 2021-07-10 21:58:33 +01:00
parent 1d1fa91401
commit 4bb359f067
3 changed files with 13 additions and 13 deletions

14
Jenkinsfile vendored
View File

@ -21,7 +21,7 @@ pipeline {
} }
stage("clang-tidy") { stage("clang-tidy") {
steps { steps {
sh './clang-tidy.sh -j 3' sh './clang-tidy.sh -j 4'
} }
} }
} }
@ -30,24 +30,24 @@ pipeline {
parallel { parallel {
stage("gcc") { stage("gcc") {
environment { environment {
TRAVIS_CUBERITE_BUILD_TYPE = 'Release' CI_CUBERITE_BUILD_TYPE = 'Release'
TRAVIS_JOB_NUMBER = "{$env.BUILD_ID}" CI_JOB_NUMBER = "{$env.BUILD_ID}"
CC = "gcc" CC = "gcc"
CXX = "g++" CXX = "g++"
} }
steps { steps {
sh 'bash ./travisbuild.sh' sh 'bash ./cibuild.sh'
} }
} }
stage("clang") { stage("clang") {
environment { environment {
TRAVIS_CUBERITE_BUILD_TYPE = 'Debug' CI_CUBERITE_BUILD_TYPE = 'Debug'
TRAVIS_JOB_NUMBER = "{$env.BUILD_ID}" CI_JOB_NUMBER = "{$env.BUILD_ID}"
CC = "clang" CC = "clang"
CXX = "clang++" CXX = "clang++"
} }
steps { steps {
sh 'bash ./travisbuild.sh' sh 'bash ./cibuild.sh'
} }
} }
} }

View File

@ -2,8 +2,8 @@
set -e set -e
export CUBERITE_BUILD_SERIES_NAME="Travis $CC $TRAVIS_CUBERITE_BUILD_TYPE" export CUBERITE_BUILD_SERIES_NAME="CI $CC $CI_CUBERITE_BUILD_TYPE"
export CUBERITE_BUILD_ID=$TRAVIS_JOB_NUMBER export CUBERITE_BUILD_ID=$CI_JOB_NUMBER
export CUBERITE_BUILD_DATETIME=`date` export CUBERITE_BUILD_DATETIME=`date`
# Use ccache if available # Use ccache if available
@ -20,17 +20,17 @@ if [ `which ccache` ]; then
ccache --zero-stats ccache --zero-stats
fi fi
workdir="$CC"_"$TRAVIS_CUBERITE_BUILD_TYPE" workdir="$CC"_"$CI_CUBERITE_BUILD_TYPE"
mkdir "$workdir" mkdir "$workdir"
cd "$workdir" cd "$workdir"
# Work around a Clang + ccache issue with failing builds by disabling # Work around a Clang + ccache issue with failing builds by disabling
# precompiled headers. Turn off LTO for faster build speeds # 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 \ -DBUILD_TOOLS=Yes \
-DPRECOMPILE_HEADERS=No \ -DPRECOMPILE_HEADERS=No \
-DSELF_TEST=Yes \ -DSELF_TEST=Yes \
-DUNITY_BUILDS=${TRAVIS_CUBERITE_UNITY_BUILDS-Yes} \ -DUNITY_BUILDS=${CI_CUBERITE_UNITY_BUILDS-Yes} \
-DWHOLE_PROGRAM_OPTIMISATION=No \ -DWHOLE_PROGRAM_OPTIMISATION=No \
${CACHE_ARGS}; ${CACHE_ARGS};
@ -47,7 +47,7 @@ ctest --output-on-failure --parallel 2;
cd Server/; cd Server/;
touch apiCheckFailed.flag touch apiCheckFailed.flag
if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then if [ "$CI_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then
./Cuberite <<- EOF ./Cuberite <<- EOF
load APIDump load APIDump
apicheck apicheck