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

Release 1.52.0 #3441

Merged
merged 148 commits into from
May 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
1acdf23
Update ref.
jd-alexander Oct 9, 2020
f688790
Update ref.
jd-alexander Oct 9, 2020
b04c4a6
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Oct 9, 2020
4dde196
update ref
jd-alexander Oct 9, 2020
dcc4c77
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Oct 12, 2020
7bd151e
Update ref
jd-alexander Oct 12, 2020
ae44624
Update ref
jd-alexander Oct 12, 2020
d928049
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Oct 13, 2020
418b0f2
corrected the gutenberg ref
jd-alexander Oct 13, 2020
b72d837
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Oct 16, 2020
3c6d16d
merged master
jd-alexander Nov 14, 2020
f67d50b
Point to my fork of Gutenberg
Feb 8, 2021
c953815
Hash changes
Feb 8, 2021
2de4778
Revert update to .gitmodules
Feb 8, 2021
c4cc7e9
Update reference to latest Gutenberg commit
Feb 12, 2021
a451d8a
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Mar 2, 2021
cf6bee0
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Mar 2, 2021
4bfcc2f
Updated gutenberg reference to add search block width setting
AmandaRiu Mar 3, 2021
8120660
Merge branch 'develop' into add/search-block-main
AmandaRiu Mar 3, 2021
14faa53
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Mar 4, 2021
48eb5f5
updated gutenberg ref.
jd-alexander Mar 4, 2021
6a0018b
Update gutenberg reference to point to search block focus fix
AmandaRiu Mar 9, 2021
6711530
Merge branch 'develop' into add/search-block-main
AmandaRiu Mar 9, 2021
d2f3289
Update gutenberg commit hash to include search block settings
AmandaRiu Mar 16, 2021
0d7a4af
Update gutenberg commit hash to include search block settings
AmandaRiu Mar 16, 2021
1b00fa3
Merge branch 'develop' into add/search-block-main
AmandaRiu Mar 16, 2021
1b4b88e
merged in develop and updated gb ref.
jd-alexander Mar 17, 2021
7b8dcaf
added release notes entry.
jd-alexander Mar 17, 2021
3630ed1
Update gutenberg commit hash to include fixes
AmandaRiu Mar 17, 2021
f658776
Merge branch 'develop' into add/search-block-main
AmandaRiu Mar 19, 2021
2ac9960
update gutenberg reference to include search block styling
AmandaRiu Mar 20, 2021
53eba22
update gutenberg reference to include search block styling
AmandaRiu Mar 20, 2021
f29f1b9
Update gutenberg commit hash to point to latest commit
AmandaRiu Mar 27, 2021
7f26040
Update gutenberg hash to publish android artifacts to S3
oguzkocer Mar 30, 2021
cee39ee
Update CircleCI to publish to S3 instead of Bintray
oguzkocer Mar 29, 2021
2dbb9a2
Update gutenberg hash to include checkIfVersionIsAlreadyPublished task
oguzkocer Mar 31, 2021
bcba16d
update gutenberg submodule ref
guarani Mar 31, 2021
e1e1590
Merge branch 'trunk' into add/search-block-main
AmandaRiu Apr 5, 2021
4303a59
Update gutenberg commit hash to point to search block tests
AmandaRiu Apr 5, 2021
3d90667
Update gutenberg commit hash to point to search block tests
AmandaRiu Apr 5, 2021
0a969ff
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Apr 7, 2021
44c9532
Merge branch 'develop' into merge_release_1.50.1_to_develop
guarani Apr 10, 2021
a4cbb1a
Update gutenberg submodule ref
guarani Apr 10, 2021
94b6e0f
Merge branch 'develop' into merge_release_1.50.1_to_develop
guarani Apr 12, 2021
a39ed0c
update gutenberg reference for #30855
AmandaRiu Apr 15, 2021
aa8cce0
Merge branch 'develop' into add-featured-badge
Apr 15, 2021
64afa88
retrigger checks
Apr 15, 2021
1bd8979
retrigger checks
Apr 15, 2021
f29c3c4
Merge branch 'add/search-block-main' of github.com:wordpress-mobile/g…
AmandaRiu Apr 16, 2021
4ae805c
Merge branch 'trunk' into add/search-block-main
AmandaRiu Apr 16, 2021
c3e72d9
Update gutenberg reference to latest commit
AmandaRiu Apr 16, 2021
b360d9e
Add release notes for Search Block
AmandaRiu Apr 16, 2021
057bfe8
Merge branch 'develop' into add/search-block-main
AmandaRiu Apr 16, 2021
40ea390
Add WPiOS Integration document
ceyhun Apr 16, 2021
6911a80
Merge branch 'develop' into merge_release_1.50.1_to_develop
guarani Apr 16, 2021
22a0ea7
Updated bundle
guarani Apr 16, 2021
2ddf84e
Merge pull request #3364 from wordpress-mobile/merge_release_1.50.1_t…
guarani Apr 16, 2021
2d62d49
Merge branch 'develop' of github.com:wordpress-mobile/gutenberg-mobil…
dcalhoun Apr 16, 2021
7b36b93
Update gutenberg ref to gutenberg-mobile release 1.51.0
dcalhoun Apr 16, 2021
3c38175
Merge pull request #3386 from wordpress-mobile/merge_release_1.51.0_t…
dcalhoun Apr 16, 2021
8318d0f
Update Gutenberg ref
fluiddot Apr 19, 2021
36f11f0
Update Gutenberg ref
fluiddot Apr 19, 2021
5f3658f
Merge pull request #3389 from wordpress-mobile/fix/block-actions-menu…
fluiddot Apr 19, 2021
7cffb56
Update Gutenberg ref
fluiddot Apr 19, 2021
0ef08f7
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Apr 19, 2021
2ef3ba0
Update Gutenberg ref
fluiddot Apr 20, 2021
57e3b87
Bump Gutenberg
Apr 20, 2021
d32f693
Update RELEASE-NOTES.txt
Apr 20, 2021
a7aef3d
Bump Gutenberg
Apr 20, 2021
5bed782
Merge branch 'develop' into add-featured-badge
Apr 20, 2021
81e0768
Update RELEASE-NOTES.txt
Apr 20, 2021
3135669
Bump Gutenberg
Apr 20, 2021
141d3ea
Bump Gutenberg
Apr 20, 2021
a26cd60
Merge pull request #3371 from wordpress-mobile/add-featured-badge
SiobhyB Apr 20, 2021
c2fff35
Update WPAndroid Integration.md
SiobhyB Apr 20, 2021
bfa4695
Tweaks to wording
SiobhyB Apr 20, 2021
0b00b34
Change positioning of note for clarification
SiobhyB Apr 20, 2021
4143d27
Merge pull request #3396 from wordpress-mobile/update/wpandroid-integ…
SiobhyB Apr 20, 2021
8df8fa8
update gutenberg reference
AmandaRiu Apr 20, 2021
4b6500e
Merge branch 'develop' into add/search-block-main
AmandaRiu Apr 20, 2021
1501723
Update gutenberg reference
AmandaRiu Apr 20, 2021
75fca8f
Put the release notes entry under unreleased.
jd-alexander Apr 20, 2021
d335708
Merge branch 'develop' into issue-946/simplify_image_insertion_flow
jd-alexander Apr 20, 2021
3c46feb
Updated gutenberg ref to merge commit.
jd-alexander Apr 20, 2021
d30a912
Merge pull request #2700 from wordpress-mobile/issue-946/simplify_ima…
jd-alexander Apr 21, 2021
1c2a353
Update gutenberg reference
AmandaRiu Apr 21, 2021
333a3cf
Update gutenberg reference
AmandaRiu Apr 21, 2021
70813ee
Update gutenberg reference
AmandaRiu Apr 21, 2021
6912928
Update gutenberg reference
AmandaRiu Apr 21, 2021
56f332a
Updated gutenberg ref.
jd-alexander Apr 21, 2021
dc9d49a
Added release notes.
jd-alexander Apr 21, 2021
9c4a82f
Removed unneeded line.
jd-alexander Apr 21, 2021
6ed7642
Update GB hash
hypest Apr 21, 2021
beff580
Update Gutenberg ref
fluiddot Apr 21, 2021
91dda05
Update RELEASE-NOTES.txt
hypest Apr 21, 2021
26e4f84
Updated gutenberg ref to merge commit.
jd-alexander Apr 21, 2021
512e42b
Merge pull request #3406 from wordpress-mobile/fix/insertion-ui-test-…
jd-alexander Apr 21, 2021
6eea2ee
merged in develop and updated gutenberg ref.
jd-alexander Apr 21, 2021
7fa0b66
Update the GB hash to the merged-to-trunk one
hypest Apr 22, 2021
88d99f4
Merge branch 'develop' into issue/2633-remove-press-action-on-non-int…
hypest Apr 22, 2021
67818ce
Merge pull request #3404 from wordpress-mobile/issue/2633-remove-pres…
hypest Apr 22, 2021
1df5311
Update Gutenberg ref
fluiddot Apr 22, 2021
6971e9d
Update Gutenberg ref
fluiddot Apr 22, 2021
0023cc5
Block list item - Remove unused code (#3410)
Apr 22, 2021
7b1abe7
Update Gutenberg ref with merge commit
fluiddot Apr 22, 2021
9504774
Merge pull request #3411 from wordpress-mobile/fix/notice-size-overflow
fluiddot Apr 22, 2021
f9f2073
updated with develop and sync gb ref.
jd-alexander Apr 23, 2021
b7efbf0
updated gutenberg ref with merge commit.
jd-alexander Apr 23, 2021
621fc96
Update gutenberg reference
AmandaRiu Apr 23, 2021
3adcd7d
Merge branch 'add/search-block-main' of github.com:wordpress-mobile/g…
AmandaRiu Apr 23, 2021
5242317
Fix merge issue in release notes
AmandaRiu Apr 23, 2021
3afaef1
Merge pull request #3399 from wordpress-mobile/add/file-audio-block-s…
jd-alexander Apr 23, 2021
fb1a6ef
Update Gutenberg ref to merge commit
fluiddot Apr 23, 2021
5907dae
Merge branch 'develop' into update/reusable-block-convert-to-regular-…
fluiddot Apr 23, 2021
a37047a
Merge pull request #3397 from wordpress-mobile/update/reusable-block-…
fluiddot Apr 23, 2021
03e5cee
Add search block to supported blocks
AmandaRiu Apr 23, 2021
4ede249
Merge branch 'develop' into issue/publish-android-artifacts-to-s3
jd-alexander Apr 23, 2021
63cb969
Updated gutenberg ref to merge commit.
jd-alexander Apr 23, 2021
73b8188
Merge pull request #3325 from wordpress-mobile/issue/publish-android-…
jd-alexander Apr 23, 2021
91462b7
Merge branch 'develop' into add/search-block-main
AmandaRiu Apr 23, 2021
8c65310
Update gutenberg reference
AmandaRiu Apr 23, 2021
033cf98
Update WPiOS Integration.md
ceyhun Apr 26, 2021
82c5d2c
Update WPiOS Integration.md
ceyhun Apr 26, 2021
843be71
Update WPiOS Integration.md
ceyhun Apr 26, 2021
f108379
Update WPiOS Integration.md
ceyhun Apr 26, 2021
3080a3b
Update WPiOS Integration.md
ceyhun Apr 26, 2021
8237712
Update WPiOS Integration.md
ceyhun Apr 26, 2021
c9048f3
Update WPiOS Integration.md
ceyhun Apr 26, 2021
b3d2925
Merge pull request #3210 from wordpress-mobile/add/search-block-main
AmandaRiu Apr 26, 2021
8efdc5b
Updates relative block-support asset path (#3418)
Apr 27, 2021
dae46fc
Update WPiOS Integration.md
ceyhun Apr 27, 2021
e81082c
Update WPiOS Integration.md
ceyhun Apr 27, 2021
6e76f40
Merge pull request #3383 from wordpress-mobile/add/wp-ios-integration…
ceyhun Apr 27, 2021
a32f2a0
Add prebundle to bundle command
fluiddot Apr 27, 2021
95f1429
Add prebundle command to Android publish package CI job
fluiddot Apr 27, 2021
700d17e
Merge branch 'develop' of github.com:wordpress-mobile/gutenberg-mobil…
dcalhoun Apr 28, 2021
e1611a2
Update gutenberg ref to release merge commit in trunk
dcalhoun Apr 28, 2021
9a7c745
Merge pull request #3423 from wordpress-mobile/fix/update-i18n-cache
fluiddot Apr 28, 2021
7950e12
Merge pull request #3426 from wordpress-mobile/merge_release_1.51.1_t…
dcalhoun Apr 28, 2021
a9e0c52
Update Gutenberg ref with merge commit
fluiddot Apr 29, 2021
d299200
Merge branch 'develop' into update/reusable-block-use-inner-block
fluiddot Apr 29, 2021
8c2c790
Merge pull request #3391 from wordpress-mobile/update/reusable-block-…
fluiddot Apr 29, 2021
05c4dd1
Release script: Update gb mobile version to 1.52.0
cameronvoell Apr 30, 2021
7555ba8
Release script: Update gutenberg ref
cameronvoell Apr 30, 2021
8645885
Release script: Update bundle for: 1.52.0
cameronvoell Apr 30, 2021
6663aa8
try manually updating bundle
cameronvoell Apr 30, 2021
ec4f0c9
Updating release notes
cameronvoell May 1, 2021
8d4c9f2
Updating gutenberg ref for latest changelog
cameronvoell May 1, 2021
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
15 changes: 6 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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.
#
Expand Down Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Unreleased
------

1.52.0
------
* [***] 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]
Expand Down
2 changes: 2 additions & 0 deletions WPAndroid Integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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`
Loading