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

Merge 14.8 final to develop #11933

Merged
merged 56 commits into from
May 18, 2020
Merged

Merge 14.8 final to develop #11933

merged 56 commits into from
May 18, 2020

Conversation

oguzkocer
Copy link
Contributor

Aside from the regular final build commits, this PR contains changes for the Gutenberg build flow. We previously didn't merge these into develop since we wanted a more optimized flow for the Gutenberg build before all developers had to work with it. #11921 also deals with merging the Gutenberg build changes to develop, so some sort of collaboration is probably necessary.

@loremattei Let's hold off on merging this without approval from @mchowning or another Gutenberg developer.

Gerardo Pacheco and others added 30 commits May 6, 2020 14:04
Internally, passing down a "jitpack" flag to emulate the nested
gutenberg-mobile build, which behind the scenes uses Node and Yarn to
install the needed gutenberg-mobile RN dependencies to build.
On CircleCI, the JS bundle is build by a dedicated job to avoid out of
memory issues when doing it embedded in the gradle build.
To try and avoid the out of memory issue (exit code 137) that seems to
be happening.
@oguzkocer oguzkocer added the Releases Label related to managing releases label May 15, 2020
@oguzkocer oguzkocer requested review from mchowning and loremattei May 15, 2020 21:41
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented May 15, 2020

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented May 15, 2020

You can test the changes on this Pull Request by downloading the APK here.

mchowning added 2 commits May 15, 2020 20:41
…o-develop

Committing conflicts to be resolved in subsequent commit
Copy link
Contributor

@mchowning mchowning left a comment

Choose a reason for hiding this comment

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

There were some conflicts due to the .circleci/config.yml changes for Gutenberg. I merged in develop and committed the conflicts (0863281), then resolved the conflicts separately (c0ac240), so you can see what I did. Everything looks good to me from a Gutenberg build perspective. 👍

@oguzkocer
Copy link
Contributor Author

Thank you for resolving the conflicts @mchowning! 🙇‍♂️

@oguzkocer oguzkocer merged commit 2c707d8 into develop May 18, 2020
@oguzkocer oguzkocer deleted the merge/14.8-final-to-develop branch May 18, 2020 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Label related to managing releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants