chore(common): builder_describe and builder_parse should come first

builder_describe and builder_parse should come before other tests, so
that (a) scripts can return --help details, and (b) so that
builder.inc.sh can tell that the script is a valid builder script, even
if environment means that the script will not otherwise run.
This commit is contained in:
Marc Durdin 2024-05-01 16:27:25 +07:00
parent cd8121ef65
commit b003e7b4bf
3 changed files with 15 additions and 15 deletions

View file

@ -5,11 +5,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
if [[ $BUILDER_OS != linux ]]; then
builder_echo grey "Platform is not linux; skipping common/linux"
exit 0
fi
#
# TODO: when we have linux-specific tests, add them here
# as child modules
@ -23,6 +18,11 @@ builder_describe "Keyman common Linux modules" \
builder_parse "$@"
if [[ $BUILDER_OS != linux ]]; then
builder_echo grey "Platform is not linux; skipping common/linux"
exit 0
fi
#-------------------------------------------------------------------------------------------------------------------
builder_run_child_actions clean configure build test

View file

@ -5,11 +5,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
if [[ $BUILDER_OS != mac ]]; then
builder_echo grey "Platform is not macOS; skipping common/mac"
exit 0
fi
#
# TODO: when we have mac-specific tests, add them here
# as child modules
@ -23,6 +18,11 @@ builder_describe "Keyman common mac modules" \
builder_parse "$@"
if [[ $BUILDER_OS != mac ]]; then
builder_echo grey "Platform is not macOS; skipping common/mac"
exit 0
fi
#-------------------------------------------------------------------------------------------------------------------
builder_run_child_actions clean configure build test

View file

@ -5,11 +5,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
if [[ $BUILDER_OS != windows ]]; then
builder_echo grey "Platform is not Windows; skipping common/windows"
exit 0
fi
#
# TODO: when we have windows-specific tests, add them here
# as child modules
@ -23,6 +18,11 @@ builder_describe "Keyman common Windows modules" \
builder_parse "$@"
if [[ $BUILDER_OS != windows ]]; then
builder_echo grey "Platform is not Windows; skipping common/windows"
exit 0
fi
#-------------------------------------------------------------------------------------------------------------------
builder_run_child_actions clean configure build test