Skip to content
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(web): merge master into epic/web-core 🎼 #12509

Merged
merged 187 commits into from
Oct 9, 2024

Conversation

ermshiperete
Copy link
Contributor

Nnyny and others added 30 commits May 27, 2024 15:39
…-tests-2' into test/developer/kmcmplib-compiler-unit-tests-3

# 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
…compiler-unit-tests-3

# 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
…compiler-unit-tests-3

# 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
…compiler-unit-tests-3

# 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
…compiler-unit-tests-3

# 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
…st, but with ERROR_StoreDoesNotExist cases commented out due to bug
…ry local variables for two others in GetXStringImpl_type_c test
…compiler-unit-tests-3

# 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
…arser3

chore(developer,common): deps: replace xml2js with fast-xml-parser
@keymanapp-test-bot keymanapp-test-bot bot added this to the A18S12 milestone Oct 8, 2024
@ermshiperete ermshiperete force-pushed the chore/merge-master-into-web-core branch from 8e15fe8 to 9ca664e Compare October 8, 2024 07:05
@mcdurdin
Copy link
Member

mcdurdin commented Oct 8, 2024

This PR is currently targeting master -- that doesn't seem right.

@ermshiperete ermshiperete force-pushed the chore/merge-master-into-web-core branch from 9ca664e to 999451d Compare October 8, 2024 13:20
@ermshiperete ermshiperete force-pushed the chore/merge-master-into-web-core branch from 999451d to df590ad Compare October 8, 2024 13:21
@ermshiperete ermshiperete changed the base branch from master to epic/web-core October 8, 2024 14:43
@keymanapp-test-bot keymanapp-test-bot bot changed the title chore(web): merge master into epic/web-core chore(web): merge master into epic/web-core 🎼 Oct 8, 2024
@ermshiperete
Copy link
Contributor Author

This PR is currently targeting master -- that doesn't seem right.

Oops! Thanks for noticing! Would be quite a lot of commits for a merge from master into master 😄

Copy link
Contributor

@rc-swag rc-swag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSLGTM

@mcdurdin
Copy link
Member

mcdurdin commented Oct 9, 2024

FWIW, I have a script which does this automatically each sprint -- no need to do it by hand.

@ermshiperete ermshiperete merged commit f6a71cd into epic/web-core Oct 9, 2024
28 checks passed
@ermshiperete ermshiperete deleted the chore/merge-master-into-web-core branch October 9, 2024 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

10 participants