Skip to content

Commit cfd4a0b

Browse files
committed
CI: Drop old workaround, refactor script blocks
This old bug in the CI inexplicably went away at some point.
1 parent 1ee74e5 commit cfd4a0b

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

script/vsts/nightly-release.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@ jobs:
33
pool:
44
vmImage: 'ubuntu-latest'
55
steps:
6-
# This has to be done separately because VSTS inexplicably
7-
# exits the script block after `npm ci` completes.
86
- script: |
97
cd script/vsts
108
npm ci
11-
displayName: npm ci
12-
- script: node script/vsts/get-release-version.js --nightly
9+
node get-release-version.js --nightly
1310
name: Version
1411
1512
# Import OS-specific build definitions
@@ -34,8 +31,6 @@ jobs:
3431
steps:
3532
- template: platforms/templates/preparation.yml
3633

37-
#This has to be done separately because VSTS inexplicably
38-
#exits the script block after `npm ci` completes.
3934
- script: |
4035
cd script/vsts
4136
npm ci

script/vsts/pull-requests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ jobs:
55
pool:
66
vmImage: 'ubuntu-latest'
77
steps:
8-
# This has to be done separately because VSTS inexplicably
9-
# exits the script block after `npm ci` completes.
108
- script: |
119
cd script/vsts
1210
npm ci
13-
displayName: npm ci
14-
- script: node script/vsts/get-release-version.js
11+
node get-release-version.js
1512
name: Version
1613
1714
# Import OS-specific build definitions

script/vsts/release-branch-build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@ jobs:
99
pool:
1010
vmImage: 'ubuntu-latest'
1111
steps:
12-
# This has to be done separately because VSTS inexplicably
13-
# exits the script block after `npm ci` completes.
1412
- script: |
1513
cd script/vsts
1614
npm ci
17-
displayName: npm ci
18-
- script: node script/vsts/get-release-version.js
15+
node get-release-version.js
1916
name: Version
2017
2118
# Import OS-specific build definitions.
@@ -39,8 +36,6 @@ jobs:
3936
IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
4037

4138
steps:
42-
# This has to be done separately because VSTS inexplicably
43-
# exits the script block after `npm ci` completes.
4439
- script: |
4540
cd script/vsts
4641
npm ci

0 commit comments

Comments
 (0)