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 version number for the coming release #2016

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

timmiesmith
Copy link
Contributor

The PR updates the oneDPL version macro and test verifying it. This PR should not be merged until code freeze for the coming release.

@dmitriy-sobolev
Copy link
Contributor

Let's also update this place:

release = '2022.7.0'

@timmiesmith
Copy link
Contributor Author

Let's also update this place:

release = '2022.7.0'

Done. Thanks for the pointer.

Copy link
Contributor

@danhoeflinger danhoeflinger 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. It may be a good idea to separate addition ONEDPL_SPEC_VERSION and the version update to different commits if it is not too much trouble.
I can see us wanting to be able to find both of these in the git log history in the future.

@timmiesmith
Copy link
Contributor Author

Looks good to me. It may be a good idea to separate addition ONEDPL_SPEC_VERSION and the version update to different commits if it is not too much trouble. I can see us wanting to be able to find both of these in the git log history in the future.

Would mention of both in the commit line be sufficient? I'm not sure how to split a PR into two separate commits when we merge.

@danhoeflinger
Copy link
Contributor

Would mention of both in the commit line be sufficient? I'm not sure how to split a PR into two separate commits when we merge.

Yeah that's probably fine as long as they are both in the top line.

If you want to split to 2 commits it would probably involve manually rebasing it locally to the commit separation you want and then force pushing (reapproving), then using "rebase and merge" from github rather than "squash and merge".

As I write this I actually see that we have lost the ability to "rebase and merge" in the change to UXL. I've used it in the past to do similar things. Its rare but useful. We may want to look into reenabling that feature.

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.

3 participants