diff options
Diffstat (limited to 'tools/buildsteps')
| -rw-r--r-- | tools/buildsteps/defaultenv | 11 | ||||
| -rwxr-xr-x | tools/buildsteps/ios/make-binary-addons | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index c55d4fa9a4..b97624598b 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -4,6 +4,7 @@ NDK_VERSION=${NDK_VERSION:-"Default"} Configuration=${Configuration:-"Default"} XBMC_DEPENDS_ROOT=${XBMC_DEPENDS_ROOT:-"Default"} PATH_CHANGE_REV_FILENAME=".last_success_revision" +FAILED_BUILD_FILENAME=".last_failed_revision" #TARBALLS ENV-VAR is only used by android scripts atm TARBALLS=${TARBALLS:-"/opt/xbmc-tarballs"} @@ -128,6 +129,16 @@ function tagSuccessFulBuild () echo "$(getBuildHash $pathToTag)" > $pathToTag/$PATH_CHANGE_REV_FILENAME } +#param1 path to be tagged with hash +function tagFailedBuild () +{ + local pathToTag + pathToTag="$1" + # tag last failed build with revisions of the given dir + # needs to match the checks in function getBuildHash + echo "$(getBuildHash $pathToTag)" > $pathToTag/$FAILED_BUILD_FILENAME +} + function getBranchName () { local branchName diff --git a/tools/buildsteps/ios/make-binary-addons b/tools/buildsteps/ios/make-binary-addons index f9f84b5873..edf4ec8ea2 100755 --- a/tools/buildsteps/ios/make-binary-addons +++ b/tools/buildsteps/ios/make-binary-addons @@ -4,6 +4,9 @@ XBMC_PLATFORM_DIR=ios . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends +#clear the build failed file +rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME + ALL_BINARY_ADDONS_BUILT="1" #only build binary addons if something in the addons metadata changed if [ "$(pathChanged $WORKSPACE/project/cmake)" == "1" ] @@ -20,6 +23,6 @@ if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ] then tagSuccessFulBuild $WORKSPACE/project/cmake else - #make jenkins fail - exit 1 + #mark the build failure in the filesystem but leave jenkins running + tagFailedBuild $WORKSPACE/project/cmake fi |