erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

chore(resources): Merge branch 'maint/resources/14506-dont-fallback-to-build-on-unsupported-targets-in-child-builds'

Browse source
This commit is contained in:
Marc Durdin 2025-08-19 12:48:01 +02:00
commit 6fc429a77e
48 changed files with 74 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/KMAPro/build.sh
View file

@ -7,7 +7,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-download-resources.sh"

1
android/KMEA/build.sh
View file

@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
# ################################ Main script ################################

1
android/Samples/KMSample1/build.sh
View file

@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
################################ Main script ################################

1
android/Samples/KMSample2/build.sh
View file

@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
################################ Main script ################################

1
android/Tests/KeyboardHarness/build.sh
View file

@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
################################ Main script ################################

1
android/build.sh
View file

@ -15,7 +15,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
# shellcheck disable=SC2154
. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
. "${KEYMAN_ROOT}/resources/build/build-utils-ci.inc.sh"
. "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
################################ Main script ################################

4
common/web/keyman-version/build.sh
View file

@ -7,7 +7,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
################################ Main script ################################
@ -56,4 +56,4 @@ export default KEYMAN_VERSION;
builder_run_action clean rm -rf version.inc.ts keyman-version.mts build/
builder_run_action configure node_select_version_and_npm_ci
builder_run_action build do_build
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
common/web/langtags/build.sh
View file

@ -7,7 +7,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Build Keyman langtags.js common module" \
"clean" \
@ -43,4 +43,4 @@ builder_run_action clean rm -rf ./build ./src/imports ./node_modules
builder_run_action configure do_configure
builder_run_action build tsc --build
builder_run_action test echo 'no tests for langtags'
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
common/web/types/build.sh
View file

@ -7,7 +7,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Build Keyman common file types module" \
"@/core/include/ldml" \
@ -105,4 +105,4 @@ builder_run_action clean rm -rf ./build/ ./tsconfig.tsbuildinfo ./src/schem
builder_run_action configure do_configure
builder_run_action build tsc --build
builder_run_action test do_test
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
core/include/ldml/build.sh
View file

@ -10,7 +10,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Keyman ldml-keyboard-constants package" \
"@/common/web/keyman-version" \
@ -34,4 +34,4 @@ builder_run_action clean rm -rf ./build/
builder_run_action configure node_select_version_and_npm_ci
builder_run_action build tsc --build
# builder_run_action test # no tests at this time
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

6
developer/src/build.sh
View file

@ -6,7 +6,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
. "$KEYMAN_ROOT/developer/src/packages.inc.sh"
builder_describe \
@ -93,7 +93,7 @@ function do_prepublish() {
# the global publish
#
builder_publish_cleanup
ci_publish_cleanup
#
# Verify that the Delphi environment is correct for a release build
@ -164,7 +164,7 @@ function do_publish() {
builder_echo info "Cleaning up package.json after 'npm version'"
# And then cleanup the mess
builder_publish_cleanup
ci_publish_cleanup
# Restore all the package.json files and package-lock.json files that
# were clobbered by 'npm version'
pushd "$KEYMAN_ROOT" >/dev/null

4
developer/src/common/web/utils/build.sh
View file

@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Build Keyman Developer web utility module" \
"@/common/web/types" \
@ -52,4 +52,4 @@ builder_run_action clean rm -rf ./build/
builder_run_action configure node_select_version_and_npm_ci
builder_run_action build do_build
builder_run_action test typescript_run_eslint_mocha_tests 45
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc-analyze/build.sh
View file

@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Keyman Developer Compiler Analysis Tools" \
"@/common/web/types" \
@ -32,4 +32,4 @@ builder_run_action configure node_select_version_and_npm_ci
builder_run_action build tsc --build
builder_run_action api api-extractor run --local --verbose
builder_run_action test typescript_run_eslint_mocha_tests 70
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc-copy/build.sh
View file

@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Build Keyman kmc-copy module" \
"@/common/web/keyman-version" \
@ -43,4 +43,4 @@ builder_run_action api api-extractor run --local --verbose
# TODO: -skip-full
builder_run_action test typescript_run_eslint_mocha_tests 75
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc-generate/build.sh
View file

@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Build Keyman kmc-generate module" \
"@/common/web/keyman-version" \
@ -44,4 +44,4 @@ builder_run_action configure node_select_version_and_npm_ci
builder_run_action build do_build
builder_run_action api api-extractor run --local --verbose
builder_run_action test typescript_run_eslint_mocha_tests
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc-keyboard-info/build.sh
View file

@ -40,6 +40,6 @@ builder_run_action test typescript_run_eslint_mocha_tests
#-------------------------------------------------------------------------------------------------------------------
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc-kmn/build.sh
View file

@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Keyman Developer Compiler Module for .kmn to .kmx" \
"@/common/web/keyman-version" \
@ -74,4 +74,4 @@ builder_run_action test do_test
#-------------------------------------------------------------------------------------------------------------------
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc-ldml/build.sh
View file

@ -93,6 +93,6 @@ builder_run_action test typescript_run_eslint_mocha_tests 90
#-------------------------------------------------------------------------------------------------------------------
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc-model-info/build.sh
View file

@ -37,6 +37,6 @@ builder_run_action test typescript_run_eslint_mocha_tests 55
#-------------------------------------------------------------------------------------------------------------------
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc-model/build.sh
View file

@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Keyman kmc Lexical Model Compiler module" \
"@/common/web/keyman-version" \
@ -42,5 +42,5 @@ builder_run_action configure node_select_version_and_npm_ci
builder_run_action build do_build
builder_run_action api api-extractor run --local --verbose
builder_run_action test typescript_run_eslint_mocha_tests
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc-package/build.sh
View file

@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
builder_describe "Build Keyman kmc Package Compiler module" \
"@/common/web/keyman-version" \
@ -39,4 +39,4 @@ builder_run_action configure node_select_version_and_npm_ci
builder_run_action build tsc --build
builder_run_action api api-extractor run --local --verbose
builder_run_action test typescript_run_eslint_mocha_tests
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc/build.sh
View file

@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/ci-publish.inc.sh"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
@ -114,4 +114,4 @@ builder_run_action build do_build
builder_run_action test do_test
builder_run_action api do_api
builder_run_action bundle do_bundle
builder_run_action publish builder_publish_npm
builder_run_action publish ci_publish_npm

4
developer/src/kmc/test/command-line-tests.sh
View file

@ -8,10 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
# . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
# . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
# . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
builder_describe "Test Keyman Keyboard Compiler kmc command line e2e" \
"test" \
"--verbose,-v Verbose logging of output from kmc" \

1
developer/src/kmcmplib/build.sh
View file

@ -7,7 +7,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$THIS_SCRIPT_PATH/checkout-keyboards.inc.sh"
. "$THIS_SCRIPT_PATH/commands.inc.sh"

1
oem/firstvoices/android/build.sh
View file

@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
# ################################ Main script ################################

57
resources/build/build-utils-ci.test.sh
View file

@ -1,57 +0,0 @@
#!/usr/bin/env bash
#
# This script tests build-utils-ci.sh
#
set -eu
## START STANDARD BUILD SCRIPT INCLUDE
# adjust relative paths as necessary
THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
# END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
# Tests
builder_echo "${COLOR_BLUE}## Testing: builder_pull_get_details with \$TEAMCITY_PR_NUMBER not set${COLOR_RESET}"
if ! builder_pull_get_details; then
builder_echo green " ✓ PASS: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER is not set"
else
builder_die "FAIL: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER is not set"
fi
builder_echo "${COLOR_BLUE}## Testing: builder_pull_get_details with \$TEAMCITY_PR_NUMBER=master${COLOR_RESET}"
TEAMCITY_PR_NUMBER=master
if ! builder_pull_get_details; then
builder_echo green " ✓ PASS: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER=master"
else
builder_die "FAIL: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER=master"
fi
builder_echo "${COLOR_BLUE}## Testing: builder_pull_get_details with \$TEAMCITY_PR_NUMBER=$TEAMCITY_PR_NUMBER${COLOR_RESET}"
TEAMCITY_PR_NUMBER=7248
if ! builder_pull_get_details; then
builder_die "FAIL: builder_pull_get_details was unable to read and parse PR details for #$TEAMCITY_PR_NUMBER from GitHub"
fi
# print metadata from PR
builder_echo " pull number: $builder_pull_number"
builder_echo " title: $builder_pull_title"
builder_echo " labels: ${builder_pull_labels[*]}"
builder_echo green " ✓ PASS: builder_pull_get_details with \$TEAMCITY_PR_NUMBER=$TEAMCITY_PR_NUMBER"
builder_echo "${COLOR_BLUE}## Testing: builder_pull_has_label epic-ldml${COLOR_RESET}"
if ! builder_pull_has_label epic-ldml; then
builder_die "FAIL: builder_pull_has_label epic-ldml"
fi
builder_echo green " ✓ PASS: builder_pull_has_label epic-ldml"
builder_echo "All tests passed."

82
resources/build/build-utils-ci.inc.sh → resources/build/ci/ci-publish.inc.sh
View file

@ -8,60 +8,6 @@
. "$KEYMAN_ROOT/resources/build/jq.inc.sh"
#
# Returns 0 if current build is in CI and triggered from a pull request. If it
# returns 0, then a call is made to GitHub to get pull request details, and the
# PR details are added to $builder_pull_title, $builder_pull_number, and
# the $builder_pull_labels array.
#
# Note that the GitHub REST call is made with credentials if $GITHUB_TOKEN is
# available; without credentials it will be subject to IP-based rate limits.
#
builder_pull_get_details() {
builder_pull_title=
builder_pull_number=
builder_pull_labels=()
if [[ ! ${TEAMCITY_PR_NUMBER-} =~ ^[0-9]+$ ]]; then
return 1
fi
if [ -z "${GITHUB_TOKEN-}" ]; then
local pull_data=`curl -s https://api.github.com/repos/keymanapp/keyman/pulls/$TEAMCITY_PR_NUMBER`
else
local pull_data=`curl -H "Authorization: Bearer $GITHUB_TOKEN" -s https://api.github.com/repos/keymanapp/keyman/pulls/$TEAMCITY_PR_NUMBER`
fi
builder_pull_title=`echo $pull_data | $JQ .title`
# Simple poor bash test if data returned from API is valid
if [[ -z builder_pull_title ]]; then
return 1
fi
builder_pull_number=$TEAMCITY_PR_NUMBER
builder_pull_labels=(`echo $pull_data | $JQ -jr '.labels[].name|.," "'`)
return 0
}
#
# Returns 0 if the current PR has a particular label. Requires
# builder_pull_get_details to have successfully run first
#
# Usage:
# builder_pull_has_label "label-name"
# Parameters
# 1: $label label to test
#
function builder_pull_has_label() {
local label="$1"
if [[ " ${builder_pull_labels[*]} " =~ " $label " ]]; then
return 0
fi
return 1
}
#
# Publishes the package in `cwd` to npm
#
@ -73,27 +19,27 @@ function builder_pull_has_label() {
# modified. This change should not be committed to the repository.
#
# If --npm-publish is set:
# * then builder_publish_npm publishes to the public registry
# * else builder_publish_npm creates a local tarball which can be used to test
# * then ci_publish_npm publishes to the public registry
# * else ci_publish_npm creates a local tarball which can be used to test
#
# Usage:
# ```bash
# builder_publish_npm
# ci_publish_npm
# ```
#
function builder_publish_npm() {
function ci_publish_npm() {
if builder_has_option --npm-publish; then
# Require --dry-run if local or test to avoid accidentally clobbering npm packages
if [[ $KEYMAN_VERSION_ENVIRONMENT =~ local|test ]] && ! builder_has_option --dry-run; then
builder_die "publish --npm-publish must use --dry-run flag for local or test builds"
fi
_builder_publish_npm_package publish
_ci_publish_npm_package publish
else
_builder_publish_npm_package pack
_ci_publish_npm_package pack
fi
}
function _builder_publish_npm_package() {
function _ci_publish_npm_package() {
local action=$1
local dist_tag=$KEYMAN_TIER dry_run=
@ -105,9 +51,9 @@ function _builder_publish_npm_package() {
dry_run=--dry-run
fi
_builder_publish_cache_package_json
_builder_write_npm_version
_builder_prepublish
_ci_publish_cache_package_json
_ci_write_npm_version
_ci_prepublish
# Note: In either case, npm publish MUST be given --access public to publish a
# package in the @keymanapp scope on the public npm package index.
@ -124,7 +70,7 @@ function _builder_publish_npm_package() {
fi
}
function _builder_write_npm_version() {
function _ci_write_npm_version() {
# We use --no-git-tag-version because our CI system controls version numbering
# and already tags releases. We also want to have the version of this match
# the release of Keyman Developer -- these two versions should be in sync.
@ -160,7 +106,7 @@ function _builder_write_npm_version() {
# the target's package.json in its node_modules folder. Must run from
# the target's folder.
#
function _builder_prepublish() {
function _ci_prepublish() {
mkdir -p node_modules/@keymanapp
local packages=($(cat package.json | "$JQ" --raw-output '.bundleDependencies | join(" ")'))
local package
@ -198,7 +144,7 @@ function _builder_prepublish() {
# dependencies easily. Part of the https://github.com/npm/cli/issues/3466
# workaround.
#
function _builder_publish_cache_package_json() {
function _ci_publish_cache_package_json() {
if [[ -f "$KEYMAN_ROOT/builder_package_publish.json" ]]; then
return 0
fi
@ -210,6 +156,6 @@ function _builder_publish_cache_package_json() {
cp "$KEYMAN_ROOT/package.json" "$KEYMAN_ROOT/builder_package_publish.json"
}
function builder_publish_cleanup() {
function ci_publish_cleanup() {
rm -f "$KEYMAN_ROOT/builder_package_publish.json"
}

3
resources/build/github.inc.sh → resources/build/ci/github.inc.sh
View file

@ -1,4 +1,5 @@
#!/usr/bin/env bash
# shellcheck shell=bash
# Keyman is copyright (C) SIL Global. MIT License.
##
## Writes a status check message to GitHub against the reported SHA

6
resources/build/help-keyman-com.sh → resources/build/ci/help-keyman-com.sh
View file

@ -3,11 +3,15 @@
## START STANDARD BUILD SCRIPT INCLUDE
# adjust relative paths as necessary
THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/ci/pull-requests.inc.sh"
# TODO: convert to builder-full-compliant script
cd "${THIS_SCRIPT_PATH}"
#
# Allows us to check for existence of subfolders in help/
#

3
resources/build/sentry-control.inc.sh → resources/build/ci/sentry-control.inc.sh
View file

@ -1,4 +1,5 @@
#!/usr/bin/env bash
# shellcheck shell=bash
# Keyman is copyright (C) SIL Global. MIT License.
#
# This script centralises sentry symbol uploads and releases

3
resources/build/trigger-build-bot.inc.sh → resources/build/ci/trigger-build-bot.inc.sh
View file

@ -1,4 +1,5 @@
#!/usr/bin/env bash
# shellcheck shell=bash
# Keyman is copyright (C) SIL Global. MIT License.
# set -eu

3
resources/build/trigger-builds.inc.sh → resources/build/ci/trigger-builds.inc.sh
View file

@ -1,4 +1,5 @@
#!/usr/bin/env bash
# shellcheck shell=bash
# Keyman is copyright (C) SIL Global. MIT License.
#
# Tell TeamCity to trigger new release builds

3
resources/build/trigger-definitions.inc.sh → resources/build/ci/trigger-definitions.inc.sh
View file

@ -1,4 +1,5 @@
#!/usr/bin/env bash
# shellcheck shell=bash
# Keyman is copyright (C) SIL Global. MIT License.
#
# This file maps specific paths to build triggers
#

6
resources/build/increment-version.sh
View file

@ -22,9 +22,9 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
. "${THIS_SCRIPT%/*}/trigger-definitions.inc.sh"
. "${THIS_SCRIPT%/*}/trigger-builds.inc.sh"
. "${THIS_SCRIPT%/*}/sentry-control.inc.sh"
. "${THIS_SCRIPT%/*}/ci/trigger-definitions.inc.sh"
. "${THIS_SCRIPT%/*}/ci/trigger-builds.inc.sh"
. "${THIS_SCRIPT%/*}/ci/sentry-control.inc.sh"
gitbranch=`git branch --show-current`

6
resources/build/run-required-test-builds.sh
View file

@ -12,9 +12,9 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
. "${THIS_SCRIPT%/*}/trigger-definitions.inc.sh"
. "${THIS_SCRIPT%/*}/trigger-builds.inc.sh"
. "${THIS_SCRIPT%/*}/trigger-build-bot.inc.sh"
. "${THIS_SCRIPT%/*}/ci/trigger-definitions.inc.sh"
. "${THIS_SCRIPT%/*}/ci/trigger-builds.inc.sh"
. "${THIS_SCRIPT%/*}/ci/trigger-build-bot.inc.sh"
. "${THIS_SCRIPT%/*}/jq.inc.sh"
builder_describe "Run test builds for the given pull request/primary branch" \

4
resources/build/test/build-bot/trigger-build-bot.test.sh
View file

@ -6,8 +6,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
# END STANDARD BUILD SCRIPT INCLUDE
. "${THIS_SCRIPT_PATH}/../../trigger-definitions.inc.sh"
. "${THIS_SCRIPT_PATH}/../../trigger-build-bot.inc.sh"
. "${THIS_SCRIPT_PATH}/../../ci/trigger-definitions.inc.sh"
. "${THIS_SCRIPT_PATH}/../../ci/trigger-build-bot.inc.sh"
. "${THIS_SCRIPT_PATH}/../test-utils.inc.sh"
. "${KEYMAN_ROOT}/resources/build/jq.inc.sh"

8
resources/teamcity/includes/tc-helpers.inc.sh
View file

@ -27,13 +27,7 @@ tc_upload_help() {
local PRODUCT=$1
local PRODUCT_PATH=$2
builder_echo start "upload help" "Uploading new ${PRODUCT} help to help.keyman.com"
(
# shellcheck disable=SC2164,SC2154
cd "${KEYMAN_ROOT}/resources/build"
"${KEYMAN_ROOT}/resources/build/help-keyman-com.sh" "${PRODUCT_PATH}"
)
"${KEYMAN_ROOT}/resources/build/ci/help-keyman-com.sh" "${PRODUCT_PATH}"
builder_echo end "upload help" success "Finished uploading new ${PRODUCT} help to help.keyman.com"
}

3
resources/teamcity/linux/keyman-linux-release.sh
View file

@ -120,8 +120,7 @@ function _publish_linux_help() {
cd "${KEYMAN_ROOT}/../help.keyman.com" || exit 1
# shellcheck disable=SC2016
git config credential.helper '!f() { sleep 1; echo "username=${GITHUB_USER}"; echo "password=${GITHUB_TOKEN}"; }; f'
cd "${KEYMAN_ROOT}/resources/build"
./help-keyman-com.sh linux
"${KEYMAN_ROOT}/resources/build/ci/help-keyman-com.sh" linux
)
builder_echo end "upload linux help" success "Upload new Keyman Linux help to help.keyman.com"

1
web/build.sh
View file

@ -9,7 +9,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
# ################################ Main script ################################

3
web/common.inc.sh
View file

@ -1,9 +1,6 @@
#!/usr/bin/env bash
#
# Needed for builder_is_ci_build check.
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
# Compiles all build products corresponding to the specified target.

1
web/src/engine/predictive-text/templates/build.sh
View file

@ -10,7 +10,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/web/common.inc.sh"
################################ Main script ################################

1
web/src/engine/predictive-text/wordbreakers/build.sh
View file

@ -10,7 +10,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/web/common.inc.sh"
################################ Main script ################################

1
web/src/engine/predictive-text/worker-main/build.sh
View file

@ -13,7 +13,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"

6
web/src/engine/predictive-text/worker-main/unit_tests/test.sh
View file

@ -3,16 +3,12 @@
## START STANDARD BUILD SCRIPT INCLUDE
# adjust relative paths as necessary
THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-basic.inc.sh"
. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
# This script runs from its own folder
cd "$THIS_SCRIPT_PATH"
################################ Main script ################################
# Defaults

1
web/src/engine/predictive-text/worker-thread/build.sh
View file

@ -11,7 +11,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/node.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/web/common.inc.sh"
WORKER_OUTPUT=build/obj

2
web/src/tools/building/check-build-size.sh
View file

@ -16,7 +16,7 @@ SIZE_THRESHOLD=1024
THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
. "$KEYMAN_ROOT/resources/build/jq.inc.sh"
. "$KEYMAN_ROOT/resources/build/github.inc.sh"
. "$KEYMAN_ROOT/resources/build/ci/github.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
display_usage() {

1
web/test.sh
View file

@ -8,7 +8,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
# This script runs from its own folder

1
windows/src/desktop/build.sh
View file

@ -6,7 +6,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
. "$KEYMAN_ROOT/developer/src/packages.inc.sh"
builder_describe \