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

Merging release/1.7 into main #14482

Closed
wants to merge 4 commits into from
Closed

Merging release/1.7 into main #14482

wants to merge 4 commits into from

Conversation

MikeAlhayek
Copy link
Member

No description provided.

MikeAlhayek and others added 2 commits October 3, 2023 12:18
* Add a fallback function to crypto.randomUUID (#14371)
* Fix modal dialog location
* Remove duplicate alert in settings (#14299)
Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
@hishamco
Copy link
Member

How is this related to #14474?

@MikeAlhayek MikeAlhayek marked this pull request as draft October 11, 2023 14:36
@MikeAlhayek MikeAlhayek mentioned this pull request Oct 13, 2023
MikeAlhayek and others added 2 commits October 13, 2023 09:00
Fix #14338

---------

Co-authored-by: yaricrolletservico <101557629+yaricrolletservico@users.noreply.github.com>
Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
@sebastienros
Copy link
Member

I don't know if we should do this from GH, I will try to merge it and do manual things if necessary.

@sebastienros sebastienros marked this pull request as ready for review October 13, 2023 16:16
@MikeAlhayek
Copy link
Member Author

Sounds good. If you end up no using this Branch, you can close it.

@sebastienros
Copy link
Member

That doesn't work as expected. Closing it and doing it manually

@sebastienros
Copy link
Member

If you end up no using this Branch, you can close it.

It's release/1.7, so no I won't close it ;)

@sebastienros
Copy link
Member

main is now up to date. We need a new PR that contains the version updates, and "this one" should be called Release 1.7.1, not the other ones that were called "Release 1.7.1" which actually contained bug fixes.

@MikeAlhayek
Copy link
Member Author

main is now up to date. We need a new PR that contains the version updates, and "this one" should be called Release 1.7.1, not the other ones that were called "Release 1.7.1" which actually contained bug fixes.

@sebastienros I am not following you. Why do we need another PR?

When we released v1.7.0, we created a branch called release/1.7 based on main. Then we released v1.7.0. Now we are trying to ship v1.7.1 so we cherry picked few PR from main and added them to release/1.7. So now release/1.7 should have what is needed to be ship into v1.7.1.

Now you merged release/1.7 back into main. So I think all we need to do is ship 1.7.1 based on release/1.7 which contains only the patches.

@sebastienros
Copy link
Member

We need to change release/1.7 content with a release notes, update the 1.7.0 versions to 1.7.1.

So now release/1.7 should have what is needed to be ship into v1.7.1.

The fixes, yes, not the docs, versions and release notes

What we did in this PR: #14111

@sebastienros
Copy link
Member

Then we create the tag v1.7.1 from this release/1.7 branch

@MikeAlhayek
Copy link
Member Author

We are on the same page now! We'll get a PR going soon

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants