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

Align develop with master #487

Merged
merged 21 commits into from
May 20, 2023
Merged

Align develop with master #487

merged 21 commits into from
May 20, 2023

Conversation

IVLIVS-III
Copy link
Contributor

This PR merges master into develop.

They diverged due to the 4.3.0 and 4.3.1 releases that cherry picked some commits.
This resulted in automated tests failures, caused by dry-running publish, which failed due to the version in pub.dev being lower than the currently published version.

Furthermore, this allows us to continue development of 5.0 on the develop branch, with an ordinary release workflow via master and release branches.

@IVLIVS-III IVLIVS-III requested a review from thomassth May 20, 2023 13:11
@IVLIVS-III
Copy link
Contributor Author

@thomassth do you have time to look at this PR?

I believe, merging master into develop will bring us quite a step closer to releasing 5.0.

@IVLIVS-III IVLIVS-III merged commit 772ee6b into develop May 20, 2023
@IVLIVS-III IVLIVS-III deleted the align-develop-with-master branch May 20, 2023 17:30
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.

6 participants