Skip to content

Commit 14075c4

Browse files
pgonzalpgonzal
authored
Merge branch 'master' into pgonzal/rush-fixes
2 parents 5e6d66a + f4e3e95 commit 14075c4

5 files changed

Lines changed: 43 additions & 7 deletions

File tree

‎apps/rush-lib/src/scripts/ci-rush.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,14 @@ if (!installedVersionValid || installedVersion !== expectedVersion) {
131131
const resultLines: string[] = [];
132132
// Trim out lines that reference environment variables that aren't defined
133133
for (const line of npmrcFileLines) {
134-
const environmentVariables: string[] | null = line.match(/\$\{([^\}]+)\}/g);
134+
const regex: RegExp = /\$\{([^\}]+)\}/g; // This finds environment varible tokens that look like "${VAR_NAME}"
135+
const environmentVariables: string[] | null = line.match(regex);
135136
let lineShouldBeTrimmed: boolean = false;
136137
if (environmentVariables) {
137-
for (const environmentVariable of environmentVariables) {
138-
if (!process.env[environmentVariable]) {
138+
for (const token of environmentVariables) {
139+
// Remove the leading "${" and the trailing "}" from the token
140+
const environmentVariableName: string = token.substring(2, token.length - 1);
141+
if (!process.env[environmentVariableName]) {
139142
lineShouldBeTrimmed = true;
140143
break;
141144
}

‎apps/rush/CHANGELOG.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
{
22
"name": "@microsoft/rush",
33
"entries": [
4+
{
5+
"version": "4.3.3",
6+
"tag": "@microsoft/rush_v4.3.3",
7+
"date": "Thu, 31 May 2018 21:57:13 GMT",
8+
"comments": {
9+
"none": [
10+
{
11+
"comment": "Remove the old undocumented \"rush purge\" command, since it conflicts with Rush 5"
12+
}
13+
]
14+
}
15+
},
416
{
517
"version": "4.3.2",
618
"tag": "@microsoft/rush_v4.3.2",

‎apps/rush/CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Change Log - @microsoft/rush
22

3-
This log was last generated on Mon, 26 Mar 2018 19:12:42 GMT and should not be manually modified.
3+
This log was last generated on Thu, 31 May 2018 21:57:13 GMT and should not be manually modified.
4+
5+
## 4.3.3
6+
Thu, 31 May 2018 21:57:13 GMT
7+
8+
### Updates
9+
10+
- Remove the old undocumented "rush purge" command, since it conflicts with Rush 5
411

512
## 4.3.2
613
Mon, 26 Mar 2018 19:12:42 GMT

‎common/changes/@microsoft/rush/ianc-minor-fix-to-ci-rush_2018-05-31-05-09.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "Minor fix to the ci-rush script.",
5+
"packageName": "@microsoft/rush",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/rush",
10+
"email": "iclanton@users.noreply.github.com"
11+
}

‎common/scripts/ci-rush.js‎

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)