summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2021-07-10 22:58:33 +0200
committerAlexander Harkness <me@bearbin.net>2021-07-10 22:59:18 +0200
commit4bb359f06796cfd93374b2ed6d2c7d07ff86749c (patch)
tree9923ac2c4d4219563ad7e143542d670d82db1d09
parentChorus fruit teleport (#5259) (diff)
downloadcuberite-4bb359f06796cfd93374b2ed6d2c7d07ff86749c.tar
cuberite-4bb359f06796cfd93374b2ed6d2c7d07ff86749c.tar.gz
cuberite-4bb359f06796cfd93374b2ed6d2c7d07ff86749c.tar.bz2
cuberite-4bb359f06796cfd93374b2ed6d2c7d07ff86749c.tar.lz
cuberite-4bb359f06796cfd93374b2ed6d2c7d07ff86749c.tar.xz
cuberite-4bb359f06796cfd93374b2ed6d2c7d07ff86749c.tar.zst
cuberite-4bb359f06796cfd93374b2ed6d2c7d07ff86749c.zip
Diffstat (limited to '')
-rw-r--r--Jenkinsfile14
-rwxr-xr-xcibuild.sh (renamed from travisbuild.sh)12
-rwxr-xr-xnightlybuild.sh (renamed from jenkinsbuild.sh)0
3 files changed, 13 insertions, 13 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 5e3097833..2d43215fc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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'
}
}
}
diff --git a/travisbuild.sh b/cibuild.sh
index 712f4e2c4..cd30cda0a 100755
--- a/travisbuild.sh
+++ b/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
diff --git a/jenkinsbuild.sh b/nightlybuild.sh
index 2ba8f4976..2ba8f4976 100755
--- a/jenkinsbuild.sh
+++ b/nightlybuild.sh