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

porting changes from develop branch to v3.4.x branch, to prepare for a 3.4.6 release #343

Merged
merged 28 commits into from
Dec 23, 2022

Conversation

edwardhartnett
Copy link
Contributor

@edwardhartnett edwardhartnett commented Dec 22, 2022

Part of #344
Fixes #345
Fixes #346
Fixes #312
Fixes #303
Fixes #250
Fixes #246
Fixes #189

Note that this PR is not to develop, but to the new branch "v3.4.x". This branch is based on the 3.4.5 release.

This PR brings some changes from develop on to the v3.4.x branch, so we can do a 3.4.6 release.

@edwardhartnett edwardhartnett changed the title moved source files into CMakeLists.txt porting changes from develop branch to v3.4.x branch, to prepare for a 3.4.6 release Dec 22, 2022
Copy link
Contributor

@Hang-Lei-NOAA Hang-Lei-NOAA left a comment

Choose a reason for hiding this comment

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

Should a code merge from the develop branch to a specific working branch need to go through the review procedure? The final changes will be brought back to develop branch after going through the review check.

@edwardhartnett edwardhartnett marked this pull request as ready for review December 23, 2022 15:33
@edwardhartnett
Copy link
Contributor Author

@Hang-Lei-NOAA in this case the branch will be used to do an intermediate release, 3.4.6.

This allows me to release some bug fixes without releasing all the changes of 3.5.0. In 3.5.0 we add a dependency on g2c.

To support this I have created the 3.4.x branch, which will be treated like the develop branch (i.e. with GitHuib protection rules, which I have set up.)

If we need to do a 3.4.7 release, we will do it from the 3.4.x branch, instead of the develop banch. When we are ready for the 3.5.0 release from the develop branch we can start to ignore the v3.4.x branch and eventually delete it.

@edwardhartnett edwardhartnett merged commit 6afd3d5 into v3.4.x Dec 23, 2022
@edwardhartnett edwardhartnett deleted the ejh_change branch December 23, 2022 15:36
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