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

[RNMobile] Add url option to image block #4779

Merged
merged 12 commits into from
May 24, 2022

Conversation

derekblank
Copy link
Contributor

@derekblank derekblank commented Apr 21, 2022

This is a PR for running CI checks on gutenberg#40334.

To test: N/A

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes more info and have added them to RELEASE-NOTES.txt if necessary.

@derekblank derekblank added the [Status] DO NOT MERGE Do not merge this PR label Apr 21, 2022
@derekblank derekblank changed the title [RNMobile] Add url option to video and image blocks [RNMobile] Add url option to image block Apr 29, 2022
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented May 10, 2022

Wanna run full suite of Android and iOS UI tests? Click here and 'Approve' CI job!

@derekblank derekblank requested a review from fluiddot May 19, 2022 05:53
@derekblank
Copy link
Contributor Author

@fluiddot I believe this is the correct way to keep the Gutenberg ref updated for gutenberg#40334. Let me know if I've missed something for the matching Gutenberg Mobile PR here. 🙇

Copy link
Contributor

@fluiddot fluiddot left a comment

Choose a reason for hiding this comment

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

@fluiddot I believe this is the correct way to keep the Gutenberg ref updated for WordPress/gutenberg#40334. Let me know if I've missed something for the matching Gutenberg Mobile PR here. 🙇

@derekblank Yeah, this is the correct way although I spotted a couple of issues that we'd need to check:

  • We shouldn't modify the .gitmodules.
  • The Gutenberg reference should point to the latest commit, now it's pointing to ee61ccb3b1eabce9dbc32fbd6c47cc64277002e7 but the last commit from the Gutenberg PR is a43fce12c6bd88c4b2307283186a1a54a3b2967b.

Additionally, it would be great to add an entry to the changelog files as outlined in the PR's submission checklist:

I have considered if this change warrants user-facing release notes more info and have added them to RELEASE-NOTES.txt if necessary.

On a different note, you can also generate this PR automatically by adding the Mobile app - Automation label to the Gutenberg PR (here you can check an example).

.gitmodules Outdated Show resolved Hide resolved
Copy link
Contributor

@fluiddot fluiddot left a comment

Choose a reason for hiding this comment

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

Approved via WordPress/gutenberg#40334 (review).

NOTE: Before merging the PR, the Gutenberg reference should point to the merge commit in trunk after merging the Gutenberg PR.

@fluiddot fluiddot added this to the 1.77.0 milestone May 20, 2022
@derekblank derekblank removed the [Status] DO NOT MERGE Do not merge this PR label May 23, 2022
@derekblank
Copy link
Contributor Author

@fluiddot Thanks for the tips! The automated PR would've been much easier. :) I think I had my wires crossed for a second, but I think I've sorted it out now after updating the changelog and the gutenberg refs. Since this PR is not automated and I cannot merge gutenberg#40334 myself, I think the next step for this PR is just to keep the submodule updated until the gutenberg PR can be merged?

@fluiddot
Copy link
Contributor

I think I had my wires crossed for a second, but I think I've sorted it out now after updating the changelog and the gutenberg refs. Since this PR is not automated and I cannot merge WordPress/gutenberg#40334 myself, I think the next step for this PR is just to keep the submodule updated until the gutenberg PR can be merged?

@derekblank Yeah exactly, the next step for this PR before merging it is to update the Gutenberg reference once WordPress/gutenberg#40334 is merged.

Since you don't have permission to merge, I can take over that 👍. In relation to this, I'll restart the failing jobs in the Gutenberg PR (looks like they fail due to flakiness) and once everything is 🟢 I'll merge it. I'll let you know when it's merged so you can update the Gutenberg reference here.

@fluiddot
Copy link
Contributor

@derekblank I've just merged the Gutenberg PR, here is the commit SHA: 20f6ca5806b753593496d2c7bf80f5bd643b34a1.

@@ -1,6 +1,7 @@
Unreleased
---
* [*] [a11y] Improve text read by screen readers for BottomSheetSelectControl [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4854]
* [*] [Image block] Add Insert from URL as a media option
Copy link
Contributor

Choose a reason for hiding this comment

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

We usually add a reference to the Gutenberg Mobile PR along with the entry, e.g.:

[a11y] Improve text read by screen readers for BottomSheetSelectControl [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4854]

Could you also add it for this change? Thanks 🙇 !

@derekblank
Copy link
Contributor Author

derekblank commented May 24, 2022

@fluiddot Thanks for merging the Gutenberg PR. I've updated the release notes, and set the gutenberg reference to 20f6ca5806b753593496d2c7bf80f5bd643b34a1.

For non-automated gutenberg-mobile PRs (like this one), when the associated gutenberg PR has been merged, would the author (i.e., me) then merge the gutenberg-mobile PR? Or is there another approval step needed? I see all of the checks have passed but I just want to confirm that it is ok to merge 🙇 .

@fluiddot
Copy link
Contributor

@fluiddot Thanks for merging the Gutenberg PR. I've updated the release notes, and set the gutenberg reference to 20f6ca5806b753593496d2c7bf80f5bd643b34a1.

🎊

For non-automated gutenberg-mobile PRs (like this one), when the associated gutenberg PR has been merged, would the author (i.e., me) then merge the gutenberg-mobile PR? Or is there another approval step needed? I see all of the checks have passed but I just want to confirm that it is ok to merge 🙇 .

Yeah, once both Gutenberg and Gutenberg-Mobile PRs are approved and ready to merge, usually the author is in charge of updating the references and merging the PRs. In this case, since everything is ready, including the PR checks, you can go ahead and merge the PR :shipit:.

This also applies to the automated Gutenberg-Mobile PRs, as only updating the Gutenberg reference is the part automated. Update the reference to point to the merge commit and PR merging is still manual.

@derekblank derekblank merged commit 09fc822 into trunk May 24, 2022
@derekblank derekblank deleted the rnmobile/add-url-option-to-video-and-image-blocks branch May 24, 2022 08:05
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