-
-
Notifications
You must be signed in to change notification settings - Fork 111
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore(core): merge master into epic/web-core 🎼 #12796
Merged
ermshiperete
merged 51 commits into
epic/web-core
from
chore/merge-master-into-web-core-again
Dec 9, 2024
Merged
chore(core): merge master into epic/web-core 🎼 #12796
ermshiperete
merged 51 commits into
epic/web-core
from
chore/merge-master-into-web-core-again
Dec 9, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…052-unit-tests-file-types
…s-unicodeset-parser-api' into test/common/web/types/9052-unit-tests-file-types
…mmented out as failing
…052-unit-tests-file-types
- basic changes to support local imports Fixes: #10649
- also improve callback visibility when XML fails to load Fixes: #10649
…o feat/developer/10649-local-imports
Co-authored-by: Marc Durdin <[email protected]>
- use path.join instead of path.resolve - rename importsPath to cldrImportsPath - remove k_015_importlocal from core, as it duplicated tests in common and developer Fixes: #10649
…052-unit-tests-file-types
- support empty string as import base
This fixes the build on my Windows machine. Previously `nvm install/use` for whatever reason caused Windows no longer be able to find `node` thus causing the build to fail. This change when run on Windows first checks the current node version and installs it only if it is not installed.
…o feat/developer/10649-local-imports
…py-full-gh-url-to-master change(developer): use full github url in kmc copy parameters 🍒
…rove-support-for-bcp47
…-support-for-bcp47 chore(developer): add baseline tests for bcp47 codes to kmc-package
Co-authored-by: Marc Durdin <[email protected]>
chore(core): only install node on Windows if not available
…master-into-web-core
ermshiperete
requested review from
jahorton,
mcdurdin,
srl295 and
rc-swag
as code owners
December 6, 2024 08:18
User Test ResultsTest specification and instructions User tests are not required Test Artifacts
|
github-actions
bot
added
web/
common/
common/resources/
Build infrastructure
core/
Keyman Core
docs
chore
labels
Dec 6, 2024
ermshiperete
requested review from
sgschantz,
SabineSIL,
darcywong00 and
markcsinclair
as code owners
December 6, 2024 08:18
keymanapp-test-bot
bot
changed the title
chore(core): merge master into epic/web-core
chore(core): merge master into epic/web-core 🎼
Dec 6, 2024
darcywong00
approved these changes
Dec 7, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rslgtm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This does another merge of
master
intoepic/web-core
- mainly so that I can make the necessary changes again to the branch I'm currently working on, while I still remember what got changed onmaster
which undoes some of the changes that were onepic/web-core
before (#12769).@keymanapp-test-bot skip