Commit graph

664 commits

Author SHA1 Message Date
Joshua Horton
9ecb89fba2
Merge pull request #13900 from keymanapp/maint/update-actions-and-octokit
maint: update @actions/github + @octokit references
2025-05-19 08:43:06 +07:00
Darcy Wong
2abb2374a4
Merge pull request #13812 from keymanapp/maint/common/7z-inc-sh
maint(common): Add zip.inc.sh for cross-platform zipping
2025-05-17 13:01:44 +07:00
Darcy Wong
2ba656d89a maint(common): Treat -x@filename as another flag 2025-05-17 12:06:56 +07:00
Darcy Wong
416fa5fa15 maint(common): Add 7z command
7z requires a command so adding `SEVENZ_CMD`
2025-05-16 09:51:43 +07:00
Darcy Wong
45cfd9fb48 chore: remove debug 2025-05-15 14:34:46 +07:00
Darcy Wong
44fd718d6d maint(common): Use -x@filename to exclude files 2025-05-15 14:22:29 +07:00
Darcy Wong
f2245442c6 chore(common): Cleanup script 2025-05-15 09:28:01 +07:00
Darcy Wong
06145a46dd
Apply suggestions from code review
Co-authored-by: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
2025-05-15 09:19:59 +07:00
Darcy Wong
46648078ac maint(android): Handle 7z call 2025-05-14 14:36:18 +07:00
Darcy Wong
271ab0f7aa maint(android): Use file parameter of files to exclude 2025-05-14 13:39:00 +07:00
Joshua Horton
08ba7c4208 maint: update @actions/github + @octokit references 2025-05-13 14:25:46 +07:00
Eberhard Beilharz
09da7c0b10
Merge pull request #13892 from keymanapp/maint/common/13885_movefuncs
This change moves the `build_is_ci_*` functions from `resources/build/build-utils-ci.inc.sh` → `resources/builder.inc.sh`.
It also adds documentation for them.

Fixes: #13885 
Fixes: #13886
2025-05-13 09:00:56 +02:00
Darcy Wong
f78a417ba2 chore(common): Merge remote-tracking branch 'origin/master' into maint/common/7z-inc-sh
# Keyman Conventional Commit suggestions:
#
# - Link to a Sentry issue with git trailer:
#     Fixes: _MODULE_-_ID_
# - Give credit to co-authors:
#     Co-authored-by: _Name_ <_email_>
# - Use imperative, present tense ('attach' not 'attaches', 'attached' etc)
# - Don't include a period at the end of the title
# - Always include a blank line before trailers
# - More: https://github.com/keymanapp/keyman/wiki/Pull-Request-and-Commit-workflow-notes
2025-05-13 11:37:30 +07:00
Darcy Wong
eedfcf2f0e chore: Merge remote-tracking branch 'origin/master' 2025-05-13 07:05:25 +07:00
Eberhard Beilharz
7d33ff7ffa
maint(common): move build_is_ci_* functions
This change moves the `build_is_ci_*` functions from
`resources/build/build-utils-ci.inc.sh` → `resources/builder.inc.sh`.

Fixes: #13885
Test-bot: skip
2025-05-12 18:16:07 +02:00
Darcy Wong
4645d1471a maint(android): Remove set_java_home_17
Unused per review comment
2025-05-12 20:53:20 +07:00
Darcy Wong
8e73f1be15 maint(common): Handle exclude filenames 2025-05-12 15:15:14 +07:00
Darcy Wong
8566b7b037 maint(common): Parameterize zip function 2025-05-12 14:38:31 +07:00
Darcy Wong
63465ca2f5 chore(common): Merge remote-tracking branch 'origin/master' into maint/common/7z-inc-sh
# Keyman Conventional Commit suggestions:
#
# - Link to a Sentry issue with git trailer:
#     Fixes: _MODULE_-_ID_
# - Give credit to co-authors:
#     Co-authored-by: _Name_ <_email_>
# - Use imperative, present tense ('attach' not 'attaches', 'attached' etc)
# - Don't include a period at the end of the title
# - Always include a blank line before trailers
# - More: https://github.com/keymanapp/keyman/wiki/Pull-Request-and-Commit-workflow-notes
2025-05-12 14:37:32 +07:00
Eberhard Beilharz
cf3c08fb03
chore(common): Merge remote-tracking branch 'origin/master' into maint/common/cleanup 2025-05-12 09:03:45 +02:00
Eberhard Beilharz
d307051836
Merge pull request #13854 from keymanapp/maint/common/versionvars
Previously the builder scripts defined a readonly `VERSION` environment variable for the Keyman version. That caused problems when another (external) script tried to define a `VERSION` variable. We encountered this problem when trying to move the TC build steps of a configuration into a single script (#13399) when we tried to source `~/.nvm/nvm.sh`.

This change uses a Keyman specific prefix for the version variables and renames `VERSION` → `KEYMAN_VERSION` etc. as well as `TIER` → `KEYMAN_TIER`. Unfortunately these variables are used in a lot of places, so this turned out to be a bit of a yak shave.
2025-05-12 08:58:19 +02:00
Marc Durdin
9802607935
Merge pull request #13857 from keymanapp/docs/common/13851-builder-md
docs(common): update readme link to builder.md
2025-05-12 11:48:36 +07:00
Eberhard Beilharz
4c4d39ef85
maint(common): use new builder_is_running_on_* functions 2025-05-09 11:56:38 +02:00
Darcy Wong
e061d3e755 docs(android): Update minimum versions docs 2025-05-09 09:43:54 +07:00
Marc Durdin
d8e7353553 chore(common): fix docs link 2025-05-09 03:48:07 +02:00
Eberhard Beilharz
907a16012c
maint(common): output start/end messages if not running on TC
If we're not running on TC we should output the start/end messages as
headings unless it's a child build. This was the previous behavior
before we added support for TC blocks.
2025-05-08 17:01:00 +02:00
Darcy Wong
c8cd5b13b3 maint(android): Add setting JAVA_HOME_21 env 2025-05-08 09:59:38 +07:00
Marc Durdin
1fbaf60cb5 docs(common): update readme link to builder.md
Fixes: #13851
2025-05-07 20:16:50 +02:00
Eberhard Beilharz
4d81589f48
maint(common): use unique names for Keyman version variables
Previously the builder scripts defined a readonly `VERSION` environment
variable for the Keyman version. That caused problems when another
(external) script tried to define a `VERSION` variable. We encountered
this problem when trying to move the TC build steps of a configuration
into a single script (#13399) when we tried to source `~/.nvm/nvm.sh`.

This change uses a Keyman specific prefix for the version variables and
renames `VERSION` → `KEYMAN_VERSION` etc. Unfortunately these variables
are used in a lot of places, so this turned out to be a bit of a yak
shave.

Test-bot: skip
2025-05-07 18:46:51 +02:00
Eberhard Beilharz
addd8b2471
docs(common): document new builder_is_running_on_teamcity function 2025-05-07 11:03:06 +02:00
Joshua Horton
849014687b
Merge pull request #13827 from keymanapp/maint/common/local-builds-as-debug
maint(common): automatically set --debug option for local-environment builder-script uses
2025-05-07 10:17:59 +07:00
Joshua Horton
e145163fc0 fix(common): change --debug shorthand use from builder test script 2025-05-07 08:36:29 +07:00
Eberhard Beilharz
0c6ea615b3
Merge pull request #13810 from keymanapp/maint/common/tcblocks
This change adds support for TC blocks of service messages (https://www.jetbrains.com/help/teamcity/service-messages.html#Blocks+of+Service+Messages) and starts/ends a block in the `builder_start_action`/`builder_finish_action` functions. We output the TC block service messages only if we're running on TC, i.e. if the `TEAMCITY_GIT_PATH` environment variable is set.

Part-of:  #13399
2025-05-06 17:41:44 +02:00
Eberhard Beilharz
adace45fac
maint(common): fixed tests 2025-05-06 16:29:42 +02:00
Darcy Wong
f44858a895 chore(common): Merge branch 'master' into maint/common/7z-inc-sh
# Keyman Conventional Commit suggestions:
#
# - Link to a Sentry issue with git trailer:
#     Fixes: _MODULE_-_ID_
# - Give credit to co-authors:
#     Co-authored-by: _Name_ <_email_>
# - Use imperative, present tense ('attach' not 'attaches', 'attached' etc)
# - Don't include a period at the end of the title
# - Always include a blank line before trailers
# - More: https://github.com/keymanapp/keyman/wiki/Pull-Request-and-Commit-workflow-notes
2025-05-06 07:32:48 +07:00
Joshua Horton
519a5b79e9 maint(common): address builder.sh test script review comments
Co-authored-by: Marc Durdin <marc@durdin.net>
2025-05-05 12:36:01 +07:00
Darcy Wong
00b2a0cf30 maint(common): Fallback to 7z 2025-05-03 09:13:09 +07:00
Joshua Horton
85046ceb6d fix(common): builder.inc.sh test script patchup for automatic local --debug 2025-05-02 15:37:39 +07:00
Darcy Wong
32ed422fd5 maint(common): Add zip_files() to zip.inc.sh 2025-05-02 13:43:03 +07:00
Marc Durdin
5f772c10f8
Merge pull request #13803 from keymanapp/maint/common/13582-test-resource-minimum-versions
maint(common): test imported resource versions
2025-05-02 13:40:34 +07:00
Marc Durdin
43cf66a9d4
Merge pull request #13796 from keymanapp/maint/meson-versioning-improvements
maint(common): cleanup meson versioning
2025-05-02 13:39:47 +07:00
Darcy Wong
d9751b39dd maint(common): Rename sevenz.inc.sh to zip.inc.sh 2025-05-02 10:44:02 +07:00
Joshua Horton
209e4e579e
Merge pull request #13807 from keymanapp/maint/disconnect-pred-text-only-ci-config
maint(web): merge LMLayer CI build config with standard Web CI build config
2025-05-02 09:55:37 +07:00
Marc Durdin
830664c8b2 docs: add --deps flags and move builder.md into /docs 2025-05-02 05:15:27 +07:00
Darcy Wong
d92c91673e maint(common): Add sevenz.inc.sh
Setup 7z environment variable according to the user's system
2025-05-01 09:07:04 +07:00
Eberhard Beilharz
92a903ddd8
maint(common): add support for TC blocks
This change adds support for TC blocks of service messages
(https://www.jetbrains.com/help/teamcity/service-messages.html#Blocks+of+Service+Messages)
and starts/ends a block in the `builder_start_action`/`builder_finish_action`
functions. We output the TC block service messages only if we're running
on TC, i.e. if the `TEAMCITY_GIT_PATH` environment variable is set.

Part-of:  #13399
Test-bot: skip
2025-04-30 20:39:09 +02:00
Joshua Horton
c505663046 maint: remove triggers for LMLayer-specific build configuration 2025-04-30 15:05:48 +07:00
Marc Durdin
1f3de1dc0a chore(common): tweak tests for cross-platform compat 2025-04-30 15:01:27 +07:00
Marc Durdin
61a114e937 maint(common): test imported resource versions
Examines imported resources such as standards data for version
information, and compares against our published minimum-versions.inc.sh
data. This test will be run in CI in common/tests.

Fixes: #13582
Test-bot: skip
2025-04-30 10:31:21 +07:00
Marc Durdin
9d2db4faf3 maint(common): consolidate standard.meson.build configuration
Use a shared function standard_meson_build to prep the
resources/meson.build folder for consistency. A future cleanup would be
to use meson-utils.inc.sh for all meson build scripts.
2025-04-30 09:16:43 +07:00