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

Update to v4.21.0 #206

Merged
merged 4 commits into from
Sep 26, 2023
Merged

Update to v4.21.0 #206

merged 4 commits into from
Sep 26, 2023

Conversation

fortunatomaldonado
Copy link
Member

#205

Update to CKEditor 4.21.0.

Please let me know if this is the correct process.

Thank you!

d529d176d7 (tag: 4.21.0) Changelog corrections.
This commit autogenerated with "./ck.sh".
@markocikos
Copy link
Member

@fortunatomaldonado When you updated base version, were our 15 commits successfully rebased on top of liferay branch on ckeeditor-dev? If there were no conflicts, great!

What's missing in this PR is the update to patches folder, probably you just need to do ./ck.sh patch. Add that commit, and we can merge PR. I believe this does not affect build artifacts, that our changes were included.

You also need to publish new version on npm. There should be a new 4.21.0-liferay.1 version here.

@fortunatomaldonado
Copy link
Member Author

Hello @markocikos,
I did find a conflict with patch 0013 that I was able to fix and merge. I then updated the patches.
Let me know if there is anything else needed to be fixed.

Once this is merge, I should create the new version on npm correct?

Thank you for taking a look at this!

@markocikos
Copy link
Member

@fortunatomaldonado are you sure that changes in patches are included in the latest build artifacts?

@fortunatomaldonado
Copy link
Member Author

@markocikos, I believe so but I could be wrong.
I went into ckeditor-web, made the changes, ran git add and git am --continue and then ran build.

Please correct me if I am messing up the process.
Thank you for your help!

@fortunatomaldonado
Copy link
Member Author

Hello @markocikos,
Is there some other way you would like me to try this?
Thank you!

@markocikos
Copy link
Member

@fortunatomaldonado just doublechecking, but this looks good! After this is merged, you can do the publish part. Note that the publish script both pushes to this repo and to npm, hopefully all permissions are set for you. The version we want is 4.21.0-liferay.1. If something goes wrong, let me know and I'll complete the release.

@markocikos markocikos merged commit d903c3f into liferay:master Sep 26, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants