Properly forward exit 1 code from the paper root command
This is so the CI server can pick up when applying patches fails, and mark the build as a failure.
This commit is contained in:
parent
e7a59cde75
commit
d54ce6c17f
20
paper
20
paper
|
@ -27,27 +27,28 @@ gitcmd="git -c commit.gpgsign=false"
|
||||||
|
|
||||||
source "$basedir/scripts/functions.sh"
|
source "$basedir/scripts/functions.sh"
|
||||||
|
|
||||||
|
failed=0
|
||||||
case "$1" in
|
case "$1" in
|
||||||
"rb" | "rbp" | "rebuild")
|
"rb" | "rbp" | "rebuild")
|
||||||
(
|
(
|
||||||
set -e
|
set -e
|
||||||
cd "$basedir"
|
cd "$basedir"
|
||||||
scripts/rebuildPatches.sh "$basedir"
|
scripts/rebuildPatches.sh "$basedir" || exit 1
|
||||||
)
|
) || failed=1
|
||||||
;;
|
;;
|
||||||
"p" | "patch")
|
"p" | "patch")
|
||||||
(
|
(
|
||||||
set -e
|
set -e
|
||||||
cd "$basedir"
|
cd "$basedir"
|
||||||
scripts/build.sh "$basedir"
|
scripts/build.sh "$basedir" || exit 1
|
||||||
)
|
) || failed=1
|
||||||
;;
|
;;
|
||||||
"j" | "jar")
|
"j" | "jar")
|
||||||
(
|
(
|
||||||
set -e
|
set -e
|
||||||
cd "$basedir"
|
cd "$basedir"
|
||||||
scripts/build.sh "$basedir" "--jar"
|
scripts/build.sh "$basedir" "--jar" || exit 1
|
||||||
)
|
) || failed=1
|
||||||
;;
|
;;
|
||||||
"make")
|
"make")
|
||||||
(
|
(
|
||||||
|
@ -191,3 +192,10 @@ unset -f color
|
||||||
unset -f colorend
|
unset -f colorend
|
||||||
unset -f paperstash
|
unset -f paperstash
|
||||||
unset -f paperunstash
|
unset -f paperunstash
|
||||||
|
if [ "$failed" == "1" ]; then
|
||||||
|
unset failed
|
||||||
|
false
|
||||||
|
else
|
||||||
|
unset failed
|
||||||
|
true
|
||||||
|
fi
|
|
@ -95,4 +95,4 @@ cd "$basedir"
|
||||||
echo "Failed to apply Paper Patches"
|
echo "Failed to apply Paper Patches"
|
||||||
exit 1
|
exit 1
|
||||||
) || exit 1
|
) || exit 1
|
||||||
)
|
) || exit 1
|
||||||
|
|
|
@ -12,4 +12,4 @@ gitcmd="git -c commit.gpgsign=false"
|
||||||
if [ "$2" == "--jar" ]; then
|
if [ "$2" == "--jar" ]; then
|
||||||
mvn clean install && ./scripts/paperclip.sh "$basedir"
|
mvn clean install && ./scripts/paperclip.sh "$basedir"
|
||||||
fi
|
fi
|
||||||
)
|
) || exit 1
|
||||||
|
|
|
@ -19,4 +19,4 @@ echo ""
|
||||||
echo ""
|
echo ""
|
||||||
echo "Build success!"
|
echo "Build success!"
|
||||||
echo "Copied final jar to $(cd "$basedir" && pwd -P)/paperclip.jar"
|
echo "Copied final jar to $(cd "$basedir" && pwd -P)/paperclip.jar"
|
||||||
)
|
) || exit 1
|
||||||
|
|
|
@ -60,4 +60,4 @@ function savePatches {
|
||||||
|
|
||||||
savePatches "$workdir/Spigot/Spigot-API" "Paper-API"
|
savePatches "$workdir/Spigot/Spigot-API" "Paper-API"
|
||||||
savePatches "$workdir/Spigot/Spigot-Server" "Paper-Server"
|
savePatches "$workdir/Spigot/Spigot-Server" "Paper-Server"
|
||||||
)
|
) || exit 1
|
||||||
|
|
Loading…
Reference in New Issue