scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #178 from petterhs/docker

Browse source 
check for cmake build-success before running post-build.sh
This commit is contained in:
JF002 2021-01-23 21:33:11 +01:00 committed by GitHub
parent 0a237a7c3a a028c39ddd
commit 80838d1e42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docker/build.sh
View file

@ -31,8 +31,8 @@ main() {
CmakeGenerate CmakeGenerate
CmakeBuild $target CmakeBuild $target
BUILD_RESULT=$?
if [[ "$DISABLE_POSTBUILD" != "true" ]]; then if [ "$DISABLE_POSTBUILD" != "true" -a "$BUILD_RESULT" == 0 ]; then
source "$BUILD_DIR/post_build.sh" source "$BUILD_DIR/post_build.sh"
fi fi
} }
@ -70,7 +70,9 @@ CmakeGenerate() {
CmakeBuild() { CmakeBuild() {
local target="$1" local target="$1"
[[ -n "$target" ]] && target="--target $target" [[ -n "$target" ]] && target="--target $target"
cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc) if cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc)
then return 0; else return 1;
fi
} }
[[ $SOURCED == "false" ]] && main "$@" || echo "Sourced!" [[ $SOURCED == "false" ]] && main "$@" || echo "Sourced!"