Commit graph

1693 commits

Author SHA1 Message Date
Eberhard Beilharz
4bfb35c19f
maint(developer): use double quotes so that variable gets replaced
This fixes developer release builds. Previously we used single quotes
for specifying `--rsync-path`. This caused the parameter to contain
the variable name instead of the content.

Follow-up-of: #14059
Part-of: #13399
Test-bot: skip
2025-06-12 18:28:15 +02:00
Eberhard Beilharz
6e7071ada6
maint(developer): define (and use) variables in developer release build
We have to define and set the variables in a powershell script so that
they can be used. This was already done for the other powershell scripts,
but overlooked for this one. Also use variables instead of hard-coding
values.
2025-06-12 18:24:15 +02:00
Marc Durdin
7b32085e0f
Merge pull request #14155 from keymanapp/maint/common/14146_macregex
maint(resources): fix regression on mac triggering builds
2025-06-11 08:39:13 +07:00
Marc Durdin
95af46d0c9
Merge pull request #14156 from keymanapp/maint/web/14151_uploadscript
maint(web): use path when calling powershell script
2025-06-11 08:29:08 +07:00
Eberhard Beilharz
fd314eb2f7
maint(developer): export environment variables
Export the newly introduced variables so that they are available in the
powershell script.

Fixes: #14150
Follow-up-of: #14052
Test-bot: skip
2025-06-10 19:43:47 +02:00
Eberhard Beilharz
1fdff7d66c
maint(web): use path when calling powershell script
Also remove the check if we're running on Windows since that is already
happening in the calling function.

Fixes: #14151
Follow-up-of: #14049
Test-bot: skip
2025-06-10 19:02:04 +02:00
Eberhard Beilharz
656c4b8c6d
maint(resources): fix regression on mac triggering builds
The `grep` available on macOS doesn't have the `--perl-regexp` option,
so the changes introduced in #14047 caused a regression. This change
directly makes use of Perl which is available on macOS.

Fixes: #14146
Follow-up-of: #14047
Test-bot: skip
2025-06-10 18:53:08 +02:00
Eberhard Beilharz
7ef985dbd8
Merge pull request #14058 from keymanapp/maint/developer/14045_docker 2025-06-10 17:32:26 +02:00
Eberhard Beilharz
33fe775aa7
maint(developer): use docker buildx to build docker images
This change verifies that `docker buildx` is available and then uses that
for building the images. For that we apparently need the magic line at
the top of the `Dockerfile`s and set the environment variable
`DOCKER_BUILDKIT`. This solves a problem building docker images on
Linux with an older Docker version where the heredocs didn't work.
2025-06-06 18:10:53 +02:00
Eberhard Beilharz
f13134100c
maint(developer): specify platforms as targets instead of actions in run.sh
This adjusts `resources/docker-images/run.sh` to more closely match
the syntax in `build.sh`.
2025-06-06 17:07:02 +02:00
Eberhard Beilharz
a4b9fe67e3
Merge pull request #14059 from keymanapp/maint/developer/13399_tc-config-dev-refactor
This adds a `configure` build step that will install any missing dependencies required to build on Linux.

Part-of: #13399 
Fixes: #14131
2025-06-06 09:35:16 +02:00
Eberhard Beilharz
2b73148efc
Merge pull request #14052 from keymanapp/maint/web/13399_tc-config_dev
This matches the existing TC configuration as closely as possible.

Part-of: #13399
2025-06-05 12:32:54 +02:00
Eberhard Beilharz
962eb76ef6
Merge pull request #14051 from keymanapp/maint/web/13399_tc-config_refactor
This refactors the build script and makes some changes so that it is possible to run in a docker container on a developer's machine.

Part-of: #13399
2025-06-05 12:32:00 +02:00
Eberhard Beilharz
8679b6db1d
maint(developer): change to correct directory for powershell scripts 2025-06-05 09:42:39 +02:00
Eberhard Beilharz
36fb4d30b8
maint(web): fix working directory for zipping artifacts for Web release
This fixes the Keyman for Web release builds - the script expects to be
run from `${KEYMANROOT}/web`.
2025-06-05 09:07:17 +02:00
Eberhard Beilharz
ce86bcd6a0
maint(developer): fix build on Windows agents
Windows agents have NVM installed in a different place, and always enabled
so we don't need to set variables for NVM.
2025-06-05 09:00:23 +02:00
Eberhard Beilharz
e3ebc2e05f
maint(developer): fix build errors
The mainly sneaked in by merging changes from other branches.
2025-06-04 20:58:26 +02:00
Eberhard Beilharz
3e3c56f9e7
maint(developer): add arguments to keyman-developer-release.sh script
Instead of relying on set environment variables this now allows to pass
the required values as arguments.
2025-06-04 20:47:00 +02:00
Eberhard Beilharz
06cb2520e9
maint(developer): run publish action only on Windows
This addresses a code review comment. Instead of checking on each
sub action this now checks on the main publish action.
2025-06-04 20:39:26 +02:00
Eberhard Beilharz
f13270275f
maint(developer): run platform specific scripts only on that platform 2025-06-04 19:54:27 +02:00
Eberhard Beilharz
3a8a823c63
maint(developer): fix typos 2025-06-04 19:53:55 +02:00
Eberhard Beilharz
a85e14feef
maint(developer): add more file headers 2025-06-04 19:53:23 +02:00
Eberhard Beilharz
087c2eec9d
maint(developer): don't automatically install packages on macOS 2025-06-04 19:07:36 +02:00
Eberhard Beilharz
0d0f67ace8
chore(developer): Merge branch 'maint/web/13399_tc-config_dev' into maint/developer/13399_tc-config-dev-refactor 2025-06-04 18:27:07 +02:00
Eberhard Beilharz
19044708bb
chore(web): Merge branch 'maint/web/13399_tc-config_refactor' into maint/web/13399_tc-config_dev 2025-06-04 18:22:32 +02:00
Eberhard Beilharz
ab2f7c2d30
chore(web): Merge branch 'master' into maint/web/13399_tc-config_refactor 2025-06-04 18:20:39 +02:00
Eberhard Beilharz
35c92f984e
Merge pull request #14049 from keymanapp/maint/web/13399_tc-config 2025-06-04 18:07:37 +02:00
Eberhard Beilharz
86f3f77623
maint(web): update or add file header 2025-06-04 18:05:47 +02:00
Eberhard Beilharz
dc67fd7d28
maint(web): address code review comments
- update and fix file header
- renamed env variables for path to s.keyman.com/help.keyman.com to
  match what is used elsewhere
2025-06-04 16:39:56 +02:00
Darcy Wong
3462655130 Merge remote-tracking branch 'origin/master' into maint/android/ci-publish 2025-06-04 18:44:35 +07:00
Eberhard Beilharz
6b3956ecaa
docs(developer): update README.md for docker images 2025-06-04 11:53:11 +02:00
Eberhard Beilharz
43c005c3f9
maint(developer): address code review comments
Don't try to install dependencies on macOS - build agents on Windows
and macOS are currently configured manually at this point. We don't
want to be attempting to install dependencies on macOS automatically -
homebrew is extremely fragile for CI as it always updates everything to
latest version (which of course breaks many things).

(from https://github.com/keymanapp/keyman/pull/14059#pullrequestreview-2873213671)
2025-06-03 18:40:23 +02:00
Eberhard Beilharz
e2c32e5126
chore(developer): Merge branch 'maint/web/13399_tc-config_dev' into maint/developer/13399_tc-config-dev-refactor 2025-06-03 18:29:00 +02:00
Eberhard Beilharz
1fa0372147
maint(web): address code review comments 2025-06-03 18:09:41 +02:00
Eberhard Beilharz
ef5d4306e8
maint(web): address code review comments from #14049
Co-authored-by: Marc Durdin <marc@durdin.net>
2025-06-03 18:04:00 +02:00
Eberhard Beilharz
23107eab95
chore(web): Merge branch 'maint/web/13399_tc-config' into maint/web/13399_tc-config_refactor 2025-06-03 18:01:09 +02:00
Eberhard Beilharz
ed67a04ec4
maint(web): allow to specify paths as arguments
This adds command line arguments for the paths to the `s.keyman.com` and
`help.keyman.com` repos.

This deviates from sticking strictly with what's on TC so that we can
pass the desired arguments right from the start and don't have to add
another check in the TC build steps.
2025-06-03 17:37:15 +02:00
Eberhard Beilharz
581e4e03ef chore(linux): add TC test runner
This adds a modified version of JetBrains' TeamCity test runner that
makes use of the `parent` property in the service messages and thus
allows to properly indent and fold the block that contains the test
output.

Test-bot: skip
2025-06-02 15:20:42 +02:00
Darcy Wong
ceb7f741ae fix(android): Fix typos 2025-06-02 13:35:17 +07:00
Darcy Wong
6e5e25b5ea fix(android): Updates to handle zip-excludes 2025-06-02 11:45:32 +07:00
Darcy Wong
c455b8d74b
Merge pull request #13919 from keymanapp/maint/ios/use-zip-inc
maint(ios): Use zip.inc.sh to prep release artifacts
2025-06-02 10:27:36 +07:00
Eberhard Beilharz
c1214e7971
Merge pull request #14061 from keymanapp/maint/linux/movetcscripts 2025-05-30 11:21:39 +02:00
Eberhard Beilharz
1ba77cc5b2
maint(linux): improve output of install action 2025-05-28 20:23:06 +02:00
Eberhard Beilharz
eb1172b076
Merge pull request #14047 from keymanapp/maint/common/buildtrigger
This modifies the build triggers so that changes in `resources/teamcity` don't trigger builds on all platforms anymore. If a change happened in `resources/teamcity/$platform` or `resources/teamcity/includes` it will trigger a build for `$platform`. 

Since bash doesn't support negative look-aheads we use `grep` with the Perl regex option.

Fixes: #13943
2025-05-28 18:09:55 +02:00
Eberhard Beilharz
3e4d463fc1
maint(linux): move TC build scripts to resources/teamcity/linux
Test-bot: skip
2025-05-28 11:54:08 +02:00
Eberhard Beilharz
e7cb8b0617
maint(common): tweak labels for common and core
This change addresses code review comments. `common` and `core` also
have TC build configs, so we add labels for them as well.

Co-authored-by: Marc Durdin <marc@durdin.net>
2025-05-28 11:31:26 +02:00
Eberhard Beilharz
9939ef9e30
maint(developer): allow to build locally on Linux and macOS
This adds a `configure` build step that will install any missing
dependencies required to build on Linux and macoS.

macOS was added based on `resources/devbox/macos/macos.sh` but is
untested.

Test-bot: skip
2025-05-27 20:14:02 +02:00
Eberhard Beilharz
254544364b
maint(web): fix typo 2025-05-27 20:10:43 +02:00
Eberhard Beilharz
58bf8557bb
maint(web): change to correct directory 2025-05-27 20:08:24 +02:00
Eberhard Beilharz
bf5909e51b
maint(web): improve TC build script for Keyman Web/Release 2025-05-27 20:04:58 +02:00