Skip to content

Re-introduce the react-native-aztec submodule to make JitPack green #486

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.

Sign up for GitHub

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

Merged
hypest merged 4 commits into from
Jan 23, 2019
Merged

Re-introduce the react-native-aztec submodule to make JitPack green #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92841e3
Moved the react-native-aztec submodule to prepare for subtree
hypest Jan 22, 2019
6840b35
Merge branch 'develop' into try/move-submodule-before-subtree
hypest Jan 22, 2019
10521bd
Rename and blacklist the old react-native-aztec submodule
hypest Jan 22, 2019
237f6ca
Work around licenses issue by manually accepting them
hypest Jan 22, 2019
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
2 changes: 1 addition & 1 deletion .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ gutenberg
symlinked-packages-in-parent
react-native-aztec
bundle

react-native-aztec-old-submodule
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "gutenberg"]
path = gutenberg
url = ../../WordPress/gutenberg.git
[submodule "react-native-aztec"]
path = react-native-aztec-old-submodule
url = ../react-native-aztec.git
2 changes: 1 addition & 1 deletion jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {
'/gutenberg/packages/',
],
testURL: 'http://localhost/',
modulePathIgnorePatterns: [ '<rootDir>/gutenberg/gutenberg-mobile' ],
modulePathIgnorePatterns: [ '<rootDir>/gutenberg/gutenberg-mobile', 'react-native-aztec-old-submodule' ],
moduleDirectories: [ 'node_modules', 'symlinked-packages' ],
moduleNameMapper: {
// Mock the CSS modules. See https://facebook.github.io/jest/docs/en/webpack.html#handling-static-assets
Expand Down
3 changes: 3 additions & 0 deletions jitpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
before_install:
- yes | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-27"
- yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;27.0.3"
install:
- echo "Changing into the android folder of the Bridge module"
- pushd react-native-gutenberg-bridge/android && ./gradlew --stacktrace clean -Pgroup=com.github.wordpress-mobile.gutenberg-mobile -Pversion=$VERSION install && popd
Expand Down
1 change: 1 addition & 0 deletions react-native-aztec-old-submodule
Open in desktop
Submodule react-native-aztec-old-submodule added at fe8e53
5 changes: 4 additions & 1 deletion rn-cli.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ const path = require( 'path' );
const blacklist = require( 'metro-config/src/defaults/blacklist' );
// Blacklist the nested GB filetree so modules are not resolved in duplicates,
// both in the nested directory and the parent directory.
const blacklistElements = blacklist( [ new RegExp( path.basename( __dirname ) + '/gutenberg/gutenberg-mobile/.*' ) ] );
const blacklistElements = blacklist( [
new RegExp( path.basename( __dirname ) + '/gutenberg/gutenberg-mobile/.*' ),
new RegExp( path.basename( __dirname ) + '/react-native-aztec-old-submodule/.*' ),
] );
const enm = require( './extra-node-modules.config.js' );

module.exports = {
Expand Down