Skip to content

Use the latest Updater and CKEditor plugins #1083

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

Closed
wants to merge 5 commits into from

Conversation

bramley
Copy link
Contributor

@bramley bramley commented May 31, 2025

Description

Includes the latest release of the Updater plugin that now tries to avoid replacing a plugin with an earlier version, and also the latest release of the CKEditor plugin.

Related Issue

Screenshots (if appropriate):

@bramley bramley changed the title Use the latest Updater plugin Use the latest Updater and CKEditor plugins Jun 6, 2025
@michield michield changed the base branch from main to release-3.7.0 June 7, 2025 09:18
@michield
Copy link
Member

can you rebase on version-3.7.0. I tried to do that, but I think it failed because I can't commit to your repository

@bramley
Copy link
Contributor Author

bramley commented Jun 14, 2025

Not sure I understand this. I'd expect the change to be applied to the main branch then you rebase the 3.7.0 branch on main to get that change.

Alternatively, can you incorporate composer update into the release process so that the latest versions of all plugins are included?

@michield
Copy link
Member

No, the process is that we create a release branch from main, then merge into the release branch, so that we can create RCs without affecting main and only once released, the release branch is merged to main

That way we can easily release security releases, like the one I had to do because there were two CVEs published.

@michield
Copy link
Member

but yes, I will look into the composer update as well. But if we have the composer.lock file on the repo, it'll have to be fixed

@michield
Copy link
Member

alternatively, you can give me push access to bramley:update_plugins

or I can fork that one and do it myself, but if we do it via your repository, you need to do the rebase.

@bramley
Copy link
Contributor Author

bramley commented Jun 19, 2025

alternatively, you can give me push access to [bramley:update_plugins]

It appears that you already have that, which I didn't realise. The change you made caused a merge conflict and the composer.lock file now has embedded conflict markers.

This seems too messy now so I am closing it and will create a new branch based on 3.7.0 and update composer on that.

@bramley bramley closed this Jun 19, 2025
@bramley bramley deleted the update_plugins branch June 19, 2025 09:19
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.

2 participants