maint(common): use builder_launch for child builds#15258
Conversation
User Test ResultsTest specification and instructions User tests are not required Test Artifacts
|
53f2dc0 to
50d12a5
Compare
Fixes: #15130 Test-bot: skip
50d12a5 to
c524db4
Compare
| function _build_sample1() { | ||
| builder_echo start "kmsample1" "Building KMSample1" | ||
| "${KEYMAN_ROOT}/ios/samples/KMSample1/build.sh" clean configure build --debug | ||
| builder_launch /ios/samples/KMSample1/build.sh clean configure build | ||
| builder_echo end "kmsample1" success "Finished building KMSample1" | ||
| } | ||
|
|
||
| function _build_sample2() { | ||
| builder_echo start "kmsample2" "Building KMSample2" | ||
| "${KEYMAN_ROOT}/ios/samples/KMSample2/build.sh" clean configure build --debug | ||
| builder_launch /ios/samples/KMSample2/build.sh clean configure build | ||
| builder_echo end "kmsample2" success "Finished building KMSample2" | ||
| } |
There was a problem hiding this comment.
The --debug flag has been set in the calling script in TeamCity directly, because these are setup only for debug builds at this point, without a development team and codesigning
Long-term builder_launch may need to handle the default action in child builds, but this is really an outlier and for now, fixing here. This resolves a situation where the unit tests were not running for web after the builder_launch update. Fixes: #15130 Build-bot: skip build:web
| local ARGS="$2" | ||
|
|
||
| # REVIEW: is it deliberate that we `configure` all targets but only `build,test` `$TARGETS`? | ||
| "${KEYMAN_ROOT}/android/build.sh" configure build,test:"${TARGETS}" ${ARGS} | ||
| builder_launch /android/build.sh configure build,test:"${TARGETS}" |
There was a problem hiding this comment.
No ARGS are provided or needed after this update (was --debug)
| android_build_action "${TARGETS}" --release | ||
| android_build_action "${TARGETS}" | ||
| do_publish | ||
| else | ||
| builder_run_action clean android_clean_action | ||
| builder_run_action build android_build_action "${TARGETS}" --release | ||
| builder_run_action build android_build_action "${TARGETS}" |
There was a problem hiding this comment.
--release is default in TC builds
| function do_build() { | ||
| "${KEYMAN_ROOT}/android/build.sh" \ |
There was a problem hiding this comment.
--debug flag is no longer required, was for Firebase in the past
| android_build_action "${TARGETS}" --debug | ||
| android_publish_symbols "${TARGETS}" --debug | ||
| android_build_action "${TARGETS}" | ||
| android_publish_symbols "${TARGETS}" | ||
| else | ||
| builder_run_action clean android_clean_action | ||
| builder_run_action build android_build_action "${TARGETS}" --debug | ||
| builder_run_action publish android_publish_symbols "${TARGETS}" --debug | ||
| builder_run_action build android_build_action "${TARGETS}" | ||
| builder_run_action publish android_publish_symbols "${TARGETS}" |
There was a problem hiding this comment.
--debug flag is no longer required, was for firebase in the past
| # Run tests | ||
| builder_run_child_actions test | ||
| builder_run_action test:_all ./test.sh | ||
| builder_run_action test:_all builder_launch /web/test.sh test |
There was a problem hiding this comment.
builder_launch currently only supports build as a default parameter
| # Embed tsysinfox64 into a resource; we have to do a special signcode for | ||
| # tsysinfox64.exe as we embed the executable into tsysinfo.exe | ||
| ../tsysinfox64/build.sh publish --no-deps | ||
| builder_launch /windows/src/engine/tsysinfox64/build.sh publish |
There was a problem hiding this comment.
Is --no-deps still used?
There was a problem hiding this comment.
Not here, it's no longer required because builder_launch means that previously built deps would have already been tracked. So this is a bit of a win. Also, builder_launch does not permit the use of --no-deps as it's a reserved parameter for child script calls.
|
Changes in this pull request will be available for download in Keyman version 19.0.171-alpha |
Notes:
--debugand--releaseflags removed (along with--no-deps). This cleans up poor child script calls which should make builds more robust and consistent and potentially faster too.Fixes: #15130
Test-bot: skip