Skip to content

Commit

Permalink
binary-addons build dont capture sh result
Browse files Browse the repository at this point in the history
The actual size of the output from the capture of the stdout is pruned and not output
to the jenkins log, therefore we do not actually see the entire build log of addons.

The .last_failed_revision seems to not be used as far as i can find, and because of the
pruned output in the result var, wont ever currently tag a failure
  • Loading branch information
fuzzard committed Dec 9, 2024
1 parent 58d9214 commit 5413bcb
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions vars/buildKodi.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -266,20 +266,11 @@ def call(Map buildParams = [:]) {
steps {
script {
env.FAILED_BUILD_FILENAME = '.last_failed_revision'
result = sh returnStdout: true, script: '''
echo "building binary addons: $ADDONS"
rm -f $WORKSPACE/cmake/.last_failed_revision
cd $WORKSPACE/tools/depends/target/binary-addons
make -j$BUILDTHREADS ADDONS="$ADDONS" V=1 VERBOSE=1
'''

hashStr = rev.trim() + verifyHash
if (result =~ /Following Addons failed to build/ ) {
writeFile file: "${WORKSPACE}/cmake/.last_failed_revision", text: "${hashStr}"
}
else {
writeFile file: "${WORKSPACE}/cmake/.last_success_revision", text: "${hashStr}"
}
sh 'bash -c "\
echo \\"building binary addons: $ADDONS\\" \
&& cd $WORKSPACE/tools/depends/target/binary-addons \
&& make -j$BUILDTHREADS ADDONS=\\"$ADDONS\\" V=1 VERBOSE=1
"'
}
}
}
Expand Down

0 comments on commit 5413bcb

Please sign in to comment.