Skip to content

Commit

Permalink
Merge branch 'master' into TIMOB-28337
Browse files Browse the repository at this point in the history
  • Loading branch information
garymathews authored Feb 9, 2021
2 parents 9ada710 + 83a1449 commit 19e72b7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def testOnAndroidDevices = false // testOnDevices // FIXME: Our android device i
def testOnIOSDevices = testOnDevices

// Variables we can change
def nodeVersion = '10.17.0' // NOTE that changing this requires we set up the desired version on jenkins master first!
def nodeVersion = '12.18.0' // NOTE that changing this requires we set up the desired version on jenkins master first!
def npmVersion = 'latest' // We can change this without any changes to Jenkins. 5.7.1 is minimum to use 'npm ci'

// Variables which we assign and share between nodes
Expand Down
7 changes: 4 additions & 3 deletions iphone/cli/hooks/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@ exports.init = function (logger, config, cli) {
return finished();
}

const i18n = require('node-appc').i18n(__dirname);
const __ = i18n.__;
const __n = i18n.__n;

if (cli.argv['build-only']) {
logger.info(__('Performed build only, skipping running of the application'));
return finished();
}

const ioslib = require('ioslib');
const i18n = require('node-appc').i18n(__dirname);
const __ = i18n.__;
const __n = i18n.__n;
const path = require('path');
const fs = require('fs-extra');
// eslint-disable-next-line security/detect-child-process
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@
"url": "git://github.com/appcelerator/titanium_mobile.git"
},
"vendorDependencies": {
"node": "10.x || 12.x"
"node": "12.x || 14.x"
},
"engines": {
"node": ">=10.13"
"node": ">=12.13.0"
},
"nyc": {
"exclude": [
Expand Down

0 comments on commit 19e72b7

Please sign in to comment.