Merge pull request #681 from realm/al/ci-fixes

[WIP] Fixes for ci
This commit is contained in:
Ari Lazier 2016-11-22 16:38:48 -08:00 committed by GitHub
commit ad1c900abf
4 changed files with 10 additions and 4 deletions

View File

@ -31,6 +31,9 @@ createMethods(List.prototype, objectTypes.LIST, [
'sorted', 'sorted',
'snapshot', 'snapshot',
'isValid', 'isValid',
'addListener',
'removeListener',
'removeAllListeners',
]); ]);
// Mutating methods: // Mutating methods:

View File

@ -30,6 +30,9 @@ createMethods(Results.prototype, objectTypes.RESULTS, [
'sorted', 'sorted',
'snapshot', 'snapshot',
'isValid', 'isValid',
'addListener',
'removeListener',
'removeAllListeners',
]); ]);
export function createResults(realmId, info) { export function createResults(realmId, info) {

View File

@ -22,6 +22,7 @@ function node_require(module) {
return require(module); return require(module);
} }
// If process is defined, we're running in node.
function isNode() { function isNode() {
return typeof process == 'object' && (('' + process) == '[object process]' || typeof jest == 'object') return typeof process == 'object' && (('' + process) == '[object process]' || typeof jest == 'object')
} }
@ -32,8 +33,7 @@ function isNode() {
var realmConstructor; var realmConstructor;
if (isNode()) { if (isNode()) {
// If process is defined, we're running in node. node_require('./submit-analytics')('Run');
require('./submit-analytics')('Run');
// Prevent React Native packager from seeing this module. // Prevent React Native packager from seeing this module.
var binary = node_require('node-pre-gyp'); var binary = node_require('node-pre-gyp');

View File

@ -108,7 +108,7 @@ trap cleanup EXIT
# Use a consistent version of Node if possible. # Use a consistent version of Node if possible.
if [ -s "${HOME}/.nvm/nvm.sh" ]; then if [ -s "${HOME}/.nvm/nvm.sh" ]; then
. "${HOME}/.nvm/nvm.sh" . "${HOME}/.nvm/nvm.sh"
nvm use 4.4.7 || true nvm use 5.12 || true
fi fi
# Remove cached packages # Remove cached packages