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

Audio Block: Add from URL #3031

Merged
merged 16 commits into from
May 21, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bumped gutenberg and merged in develop.
jd-alexander committed Apr 29, 2021
commit 41f80b332a3cf2d56f6dbb54effe4de288cf37df
15 changes: 6 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -256,7 +256,7 @@ jobs:
android-build-and-publish-react-native-bridge:
# This job builds the JS bunle required by the Android version of the
# react-native-bridge package, builds the AAR for that package, and uploads
# it to Bintray.
# it to S3.
#
# Running on a Ubuntu machine to have more memory compared to the Docker +
# Node or Docker + Android images that CircleCI offers (circleci/node)
@@ -304,12 +304,14 @@ jobs:
- npm-install
- run:
name: Build JavaScript Bundle
command: npm run bundle:android
command: |
npm run core prebundle
npm run bundle:android
# The job can take a long time, so let's bump the no_output_timeout
# to more than the default 10m
no_output_timeout: 20m
- run:
name: Build React Native Bridge & Upload to Bintray
name: Build React Native Bridge & Upload to S3
environment:
# This value is set in the setup script, but I'm not sure whether
# it's available after executing it
@@ -318,11 +320,6 @@ jobs:
# We publish from PRs as well as the main branch and tags to help
# developers to iterate faster.
#
# The builds from a PR have a different version so that they can be
# deleted by
# https://github.com/Automattic/bintray-garbage-collector/
# once their PR is merged.
#
# If we're not on a PR but a merge commit on the develop branch the
# version will be the "develop-" followed by the commit SHA1.
#
@@ -400,7 +397,7 @@ workflows:
branches:
only: /^dependabot/submodules/.*/
- android-build-and-publish-react-native-bridge:
name: Build Android RN Bridge & Publish to Bintray
name: Build Android RN Bridge & Publish to S3
filters:
branches:
# Don't run on trunk, otherwise, run on every other branch
9 changes: 9 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
Unreleased
------
* [***] New Block: Search Block [#3210]
* [**] The media upload options of the Image, Video and Gallery block automatically opens when the respective block is inserted. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2700]
* Image block: Add a "featured" banner. (Android only) [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3371]
* [**] The media upload options of the File and Audio block automatically opens when the respective block is inserted. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3399]
* [*] Remove visual feedback from non-interactive bottom-sheet cell sections [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3404]

1.51.1
------
* [*] Updates relative block-support asset path [https://github.com/WordPress/gutenberg/pull/31184]

1.51.0
------
2 changes: 2 additions & 0 deletions WPAndroid Integration.md
Original file line number Diff line number Diff line change
@@ -88,6 +88,8 @@ Besides checking a few things, `publish-aztec-and-bridge.sh` script will clean t

In order to test this, make sure `localGutenbergMobilePath` in your `local-builds.gradle` file is commented out as otherwise the binary version will be ignored.

**Note:** The `Build Android RN Bridge & Publish to Bintray` task in `gutenberg-mobile` needs to complete before WPAndroid's `Installable Build` CI task will succeed. As such, you may see WPAndroid's CI tasks fail with a 403 error if they run before the `gutenberg-mobile` task completes. You can either wait for wait for `gutenberg-mobile`'s CI task to pass before pushing changes to `ext.gutenbergMobileVersion` or restart failed WPAndroid CI tasks after `gutenberg-mobile`'s CI task passes.

---

## How to
55 changes: 55 additions & 0 deletions WPiOS Integration.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# WordPress iOS Integration Guide

## How to work with local gutenberg-mobile checkout

The `LOCAL_GUTENBERG` environment variable is useful when you want to iterate on the native iOS code (Swift, Objective-C) in `gutenberg-mobile` while testing it inside the [WPiOS](https://github.com/wordpress-mobile/WordPress-iOS) app. This also includes the case when you update a dependency in `gutenberg-mobile` that includes native code.

The `LOCAL_GUTENBERG` flag sets which JS bundle WPiOS uses. It does not impact which WPiOS run scheme is selected or whether or not Metro is used. When the flag is enabled, the bundle available within the local `gutenberg-mobile` checkout is used. That's why, when using this flag, it is better to run the Metro server or recreate JS bundles in the local `gutenberg-mobile` checkout so that the native and JS code are in sync.

To use it, you need to set `LOCAL_GUTENBERG` environment variable to the local `gutenberg-mobile` folder relative to the `WPiOS` folder.
By default `LOCAL_GUTENBERG` is set to `../gutenberg-mobile`.

1. First `cd` into your cloned WPiOS project folder and run `rake dependencies`
2. (a) If `gutenberg-mobile` is at `../gutenberg-mobile` you can directly run:
```sh
LOCAL_GUTENBERG=true bundle exec pod install
```
2. (b) Otherwise pass in the relative `gutenberg-mobile` folder like this:
```sh
LOCAL_GUTENBERG=../../xyz/gutenberg-mobile bundle exec pod install
```

3. Start the metro server in `gutenberg-mobile` with `npm run start:reset`
4. Launch the WPiOS workspace (`.xcworkspace`) in Xcode and run the app
5. You can change any JS files and metro should pick the changes up
6. If you change any native files (Swift, Objective-C, etc.) you should re-run the WPiOS app for the changes to be reflected

## How to test a gutenberg-mobile PR in WPiOS

Assuming that there is no open WPiOS PR:

1. Open `Podfile` in WPiOS project
2. Find the line where gutenberg reference is set like: `gutenberg :tag => 'vX.YY.Z'`
3. Find latest commit hash of the `gutenberg-mobile` PR
4. Replace the gutenberg reference with the commit hash: `gutenberg :commit => '123456789'`
5. Run `bundle exec pod install` inside WPiOS
6. Switch to the relevant branch in `gutenberg-mobile`and start the metro server with `npm run start:reset`
7. Launch the WPiOS workspace (`.xcworkspace`) in Xcode and run the app

**Additionally to share a WPiOS installable build (IPA)**

8. Within `gutenberg-mobile`, stop the metro server and create bundles running `npm run bundle`
9. Commit and push the bundle changes to `gutenberg-mobile`
10. Update the commit hash in the WPiOS Podfile again and run `bundle exec pod install` again
11. Commit and push the changes to `Podfile` and `Podfile.lock`
12. Open a WPiOS PR
13. Manually trigger the installable build CI job by clicking the link in the PR comments

**Additionally to release a alpha version of gutenberg-mobile and update WPiOS PR to use it**

14. Merge the `gutenberg-mobile` PR (make sure the bundles are up-to-date before merging)
15. Tag the merge commit bumping the latest tag's minor version and adding an `-alphaQ` to the end like: `v1.50.0 -> v1.51.0-alpha1`
16. If there's already an alpha, the alpha version could be increased like: `v1.51.0-alpha1` -> `v1.51.0-alpha2`
17. Open the `Podfile` again and update the gutenberg reference to use the new alpha tag: `gutenberg :tag => 'v1.51.0-alpha2'`
18. Run `bundle exec pod install`
19. Commit and push the changes to `Podfile` and `Podfile.lock`
102 changes: 51 additions & 51 deletions bundle/ios/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/ios/App.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 854 files
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gutenberg-mobile",
"version": "1.51.0",
"version": "1.51.1",
"private": true,
"config": {
"jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
@@ -61,7 +61,7 @@
"prern-bundle": "patch-package --patch-dir gutenberg/packages/react-native-editor/metro-patch",
"rn-bundle": "react-native bundle",
"postrn-bundle": "patch-package --reverse --patch-dir gutenberg/packages/react-native-editor/metro-patch",
"bundle": "npm run clean; npm run bundle:js && npm run genstrings",
"bundle": "npm run clean; npm run core prebundle && npm run bundle:js && npm run genstrings",
"bundle:js": "npm run bundle:android && npm run bundle:ios",
"bundle:android": "npm run bundle:android:text && npm run bundle:android:bytecode",
"bundle:android:text": "mkdir -p bundle/android && npm run rn-bundle -- --platform android --dev false --entry-file ./index.js --assets-dest ./bundle/android --bundle-output ./bundle/android/App.text.js --sourcemap-output ./bundle/android/App.text.js.map",
1 change: 1 addition & 0 deletions src/block-support/supported-blocks.json
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
"core/social-links",
"core/pullquote",
"core/file",
"core/search",
"jetpack/contact-info",
"jetpack/email",
"jetpack/phone",
You are viewing a condensed version of this merge commit. You can view the full changes here.