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.

Sign up for GitHub

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

Jump to bottom

post 2.5.0 release #5184

Merged
merged 2 commits into from Jul 7, 2023
Merged

post 2.5.0 release #5184

merged 2 commits into from Jul 7, 2023

Conversation

tjhei
Copy link
Member

@tjhei tjhei commented Jul 6, 2023

No description provided.

@tjhei
Copy link
Member Author

tjhei commented Jul 7, 2023

tests should be fixed with #5185

@tjhei
Copy link
Member Author

tjhei commented Jul 7, 2023

This is ready to merge.

@MFraters
Copy link
Member

MFraters commented Jul 7, 2023

rebase now #5185 is merged? Or should this be merge as soon as possible before the other pull requests start coming in?

@tjhei
Copy link
Member Author

tjhei commented Jul 7, 2023 •
edited

I rebased. It is not urgent but feel free to merge any time.

MFraters
MFraters approved these changes Jul 7, 2023
View reviewed changes
Copy link
Member

@MFraters MFraters left a comment

Choose a reason for hiding this comment

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

Looks good to me.

bangerth
bangerth reviewed Jul 7, 2023
View reviewed changes
Copy link
Contributor

@bangerth bangerth left a comment

Choose a reason for hiding this comment

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

Doesn't merging the changelog into one have to happen before the branch, not after the branch?

The versioning changes are of course ok.

@tjhei
Copy link
Member Author

tjhei commented Jul 7, 2023

Doesn't merging the changelog into one have to happen before the branch, not after the branch?

The commits are also included in the aspect-2.5 branch, see https://github.com/geodynamics/aspect/commits/aspect-2.5

@bangerth
Copy link
Contributor

bangerth commented Jul 7, 2023

I see. Thank you!

@bangerth bangerth merged commit c699806 into geodynamics:main Jul 7, 2023
6 checks passed
@tjhei tjhei deleted the post-release-2.5.0 branch August 14, 2023 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bangerth bangerth bangerth left review comments

@MFraters MFraters MFraters approved these changes

Assignees
No one assigned
Labels
ready to merge ready to test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@tjhei @MFraters @bangerth