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

fix(linux): fix problem with API checks with merge commits #12520

Merged
merged 2 commits into from
Oct 10, 2024

Conversation

ermshiperete
Copy link
Contributor

This change fixes a problem if both master and a branch added the same symbol with different version numbers. This causes a merge conflict which previously caused the API checks to output an error. However, if the version number in the .symbols file got updated since the base then it's no error which this change implements.

Also move API verification functions to separate file.

@keymanapp-test-bot skip

This will make it easier to unit test individual functions.
This change fixes a problem if both `master` and a branch added the same
symbol with different version numbers. This causes a merge conflict which
previously caused the API checks to output an error. However, if the
version number in the .symbols file got updated since the base then
it's no error which this change implements.
@keymanapp-test-bot
Copy link

keymanapp-test-bot bot commented Oct 9, 2024

User Test Results

Test specification and instructions

User tests are not required

Test Artifacts

@keymanapp-test-bot keymanapp-test-bot bot added this to the A18S12 milestone Oct 9, 2024
Copy link
Member

@mcdurdin mcdurdin left a comment

Choose a reason for hiding this comment

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

RSLGTM -- I think this is a diversion from core web though

Base automatically changed from chore/linux/skip_api_changed to master October 10, 2024 07:16
@ermshiperete ermshiperete merged commit c7c646f into master Oct 10, 2024
9 checks passed
@ermshiperete ermshiperete deleted the chore/linux/fix_apicheck branch October 10, 2024 07:17
@keyman-server
Copy link
Collaborator

Changes in this pull request will be available for download in Keyman version 18.0.125-alpha

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.

3 participants