Skip to content

Commit 0d3d08d

Browse files
iclantoniclanton
committed
Fixing the CI scripts.
1 parent 4f06edb commit 0d3d08d

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ script:
77
- set -e
88
- echo 'Checking change file...' && echo -en 'travis_fold:start:check\\r'
99
- git fetch origin master:refs/remotes/origin/master -a
10-
- node common/local-rush/node_modules/@microsoft/rush/lib/rush.js change -v
10+
- node common/local-rush/node_modules/@microsoft/rush/lib/start.js change -v
1111
- echo -en 'travis_fold:end:check\\r'
1212
- echo 'Installing...' && echo -en 'travis_fold:start:install\\r'
13-
- node common/local-rush/node_modules/@microsoft/rush/lib/rush.js install --bypass-policy
13+
- node common/local-rush/node_modules/@microsoft/rush/lib/start.js install --bypass-policy
1414
- echo -en 'travis_fold:end:install\\r'
1515
- echo 'Running rush check' && echo -en 'travis_fold:start:check\\r'
16-
- node common/local-rush/node_modules/@microsoft/rush/lib/rush.js check
16+
- node common/local-rush/node_modules/@microsoft/rush/lib/start.js check
1717
- echo -en 'travis_fold:end:check\\r'
1818
- echo 'Building...' && echo -en 'travis_fold:start:build\\r'
19-
- node common/local-rush/node_modules/@microsoft/rush/lib/rush.js rebuild --verbose --production
19+
- node common/local-rush/node_modules/@microsoft/rush/lib/start.js rebuild --verbose --production
2020
- echo -en 'travis_fold:end:build\\r'

‎common/scripts/InstallRushOnlyIfNeeded.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ const rushJsonPath = path.join(__dirname, '..', '..', 'rush.json');
2020
let expectedVersion;
2121
try {
2222
const rushJsonContents = fs.readFileSync(rushJsonPath, 'UTF-8');
23-
// Use a regular expression to parse out the rushMinimumVersion value because rush.json supports comments,
23+
// Use a regular expression to parse out the rushVersion value because rush.json supports comments,
2424
// but JSON.parse does not and we don't want to pull in more dependencies than we need to in this script.
25-
const rushJsonMatches = rushJsonContents.match(/\"rushMinimumVersion\"\s*\:\s*\"([0-9\.]+)\"/);
25+
const rushJsonMatches = rushJsonContents.match(/\"rushVersion\"\s*\:\s*\"([0-9\.]+)\"/);
2626
expectedVersion = rushJsonMatches[1];
2727
} catch (e) {
2828
console.error(`Unable to determine the required version of Rush from rush.json (${rushJsonPath}). ` +
29-
'The "rushMinimumVersion" field is either not assigned in rush.json or was specified ' +
29+
'The "rushVersion" field is either not assigned in rush.json or was specified ' +
3030
'using an unexpected syntax.');
3131
return;
3232
}

0 commit comments

Comments
 (0)