Skip to content

Conversation

@hypest
Copy link
Contributor

@hypest hypest commented Jan 22, 2019

This PR re-introduces the git submodule we removed recently, but putting it in an obscure place.

We need to do no work to update this submodule at all. Its code is not used anywhere and is only here because JitPack has trouble if it sees it go. For reference: jitpack/jitpack.io#3707.

We'll remove this submodule again, after the problem is fixed on the JitPack side of things.

To test:

Everything should work as normal, but this time git submobule update --init will pull in the "new" submodule. Let's do some testing with the demo app and the main WP apps against this one just to be sure. Thanks!

For wpandroid, there's a PR up that be used for testing: wordpress-mobile/WordPress-Android#9052

@hypest
Copy link
Contributor Author

hypest commented Jan 22, 2019

Oh no, 6840b35 was succeeding on JitPack but the follow up commit don't 🤦‍♂️. There might be an element of randomness here.

@hypest hypest force-pushed the try/move-submodule-before-subtree branch from 880c485 to 5d50a6f Compare January 22, 2019 18:02
@hypest hypest force-pushed the try/move-submodule-before-subtree branch from b33f71f to 237f6ca Compare January 22, 2019 18:16
@hypest
Copy link
Contributor Author

hypest commented Jan 22, 2019

OK, I think it's all green at the moment, will lift the "not ready for review" label :).

Copy link
Contributor

@jtreanor jtreanor left a comment

Choose a reason for hiding this comment

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

This is s pretty neat solution to an unpleasant situation.

Obviously we won't keep this hack for long but its good to get us unblocked now.

@daniloercoli
Copy link
Contributor

LGTM!

@daniloercoli daniloercoli self-requested a review January 23, 2019 10:01
Copy link
Contributor

@etoledom etoledom left a comment

Choose a reason for hiding this comment

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

WPiOS is working fine with this branch.
I also don't see any change that could affect it 👍

@hypest hypest merged commit 2a0e4db into develop Jan 23, 2019
@hypest hypest deleted the try/move-submodule-before-subtree branch January 23, 2019 10:21
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.

5 participants