From e0abca696daf52f3f2e388f5722327195c5bbbb4 Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Tue, 4 Aug 2020 12:12:09 -0400
Subject: [PATCH 1/9] CI: Fix Windows job names

Also make sure "Release" job depends on successful Windows tests,
not just on the Windows build job, before/regardless of testing.
---
 script/vsts/nightly-release.yml      | 2 +-
 script/vsts/platforms/windows.yml    | 4 ++--
 script/vsts/release-branch-build.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml
index 3d8a70efb30..2b4bfceb052 100644
--- a/script/vsts/nightly-release.yml
+++ b/script/vsts/nightly-release.yml
@@ -27,7 +27,7 @@ jobs:
 
     dependsOn:
       - GetReleaseVersion
-      - Windows
+      - Windows_RendererTests
       - Linux
       - macOS_tests
 
diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml
index 98af05ad7e3..ac7a53aead7 100644
--- a/script/vsts/platforms/windows.yml
+++ b/script/vsts/platforms/windows.yml
@@ -1,5 +1,5 @@
 jobs:
-  - job: Windows
+  - job: Windows_build
     dependsOn: GetReleaseVersion
     timeoutInMinutes: 180
     strategy:
@@ -71,7 +71,7 @@ jobs:
               condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
 
   - job: Windows_RendererTests
-    dependsOn: Windows
+    dependsOn: Windows_build
     timeoutInMinutes: 180
     strategy:
       maxParallel: 2
diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml
index ccaf5d55ebb..da3fa34f042 100644
--- a/script/vsts/release-branch-build.yml
+++ b/script/vsts/release-branch-build.yml
@@ -32,7 +32,7 @@ jobs:
 
     dependsOn:
       - GetReleaseVersion
-      - Windows
+      - Windows_RendererTests
       - Linux
       - macOS_tests
 

From 9c138f8269d361364e7d8d138e9ed292c3311b0f Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Tue, 4 Aug 2020 12:14:17 -0400
Subject: [PATCH 2/9] CI: Delete outdated comment in platforms/linux.yml

We no-longer run the Linux build in an old Ubuntu 14.04 "Trusty Tahr"
Docker container. We run builds directly in a virtualized Ubuntu 16.04
"Xenial Xerus" image now.
---
 script/vsts/platforms/linux.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml
index 975af51a757..c6995819a8f 100644
--- a/script/vsts/platforms/linux.yml
+++ b/script/vsts/platforms/linux.yml
@@ -5,7 +5,6 @@ jobs:
     variables:
       ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
     pool:
-      # This image is used to host the Docker container that runs the build
       vmImage: ubuntu-16.04
 
     steps:

From 72e9dc6a3cdad985086bf0fa7c015eefcfa8bac4 Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Tue, 4 Aug 2020 13:48:04 -0400
Subject: [PATCH 3/9] CI: Don't pass REPO variables via `env:` yml

Using the `env:` yaml key is not actually needed unless the variables
contain secret/sensitive information. (These varibales won't
have sensitive content, just a repo owner and some repo names).

These environment variables would expand to literally `${VAR_NAME}`,
rather than to an empty string, if not explicitly set in Azure DevOps.

This would make consuming the variables in JavaScript unnecessarily
awkward.

Instead, we can set reasonable defaults if the variables are falsy
(i.e. unset or null in our case), and otherwise override with what's
manually set in the environment variables.
---
 script/vsts/nightly-release.yml      | 6 ------
 script/vsts/pull-requests.yml        | 3 ---
 script/vsts/release-branch-build.yml | 9 ---------
 3 files changed, 18 deletions(-)

diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml
index 2b4bfceb052..774abb7bb62 100644
--- a/script/vsts/nightly-release.yml
+++ b/script/vsts/nightly-release.yml
@@ -11,9 +11,6 @@ jobs:
         displayName: npm ci
       - script: node script/vsts/get-release-version.js --nightly
         name: Version
-        env:
-          REPO_OWNER: $(REPO_OWNER)
-          NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
 
   # Import OS-specific build definitions
   - template: platforms/windows.yml
@@ -59,9 +56,6 @@ jobs:
           ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
           ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
           PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
-          REPO_OWNER: $(REPO_OWNER)
-          MAIN_REPO: $(MAIN_REPO)
-          NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
         displayName: Create Nightly Release
   - job: bump_dependencies
     displayName: Bump Dependencies
diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml
index de26a721d59..82367ca058c 100644
--- a/script/vsts/pull-requests.yml
+++ b/script/vsts/pull-requests.yml
@@ -13,9 +13,6 @@ jobs:
         displayName: npm ci
       - script: node script/vsts/get-release-version.js
         name: Version
-        env:
-          REPO_OWNER: $(REPO_OWNER)
-          NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
 
   # Import OS-specific build definitions
   - template: platforms/windows.yml
diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml
index da3fa34f042..6d4774d8875 100644
--- a/script/vsts/release-branch-build.yml
+++ b/script/vsts/release-branch-build.yml
@@ -17,9 +17,6 @@ jobs:
         displayName: npm ci
       - script: node script/vsts/get-release-version.js
         name: Version
-        env:
-          REPO_OWNER: $(REPO_OWNER)
-          NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
 
   # Import OS-specific build definitions.
   - template: platforms/windows.yml
@@ -66,9 +63,6 @@ jobs:
           ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
           ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
           PACKAGE_CLOUD_API_KEY: $(PACKAGE_CLOUD_API_KEY)
-          REPO_OWNER: $(REPO_OWNER)
-          MAIN_REPO: $(MAIN_REPO)
-          NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
         displayName: Create Draft Release
         condition: and(succeeded(), eq(variables['Atom.AutoDraftRelease'], 'true'), eq(variables['IsReleaseBranch'], 'true'))
 
@@ -79,8 +73,5 @@ jobs:
           ATOM_RELEASES_S3_KEY: $(ATOM_RELEASES_S3_KEY)
           ATOM_RELEASES_S3_SECRET: $(ATOM_RELEASES_S3_SECRET)
           ATOM_RELEASES_S3_BUCKET: $(ATOM_RELEASES_S3_BUCKET)
-          REPO_OWNER: $(REPO_OWNER)
-          MAIN_REPO: $(MAIN_REPO)
-          NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO)
         displayName: Upload CI Artifacts to S3
         condition: and(succeeded(), eq(variables['IsSignedZipBranch'], 'true'))

From d77c2a20bf700173c57052ca9a7fea162c0f2893 Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Tue, 4 Aug 2020 14:26:19 -0400
Subject: [PATCH 4/9] CI: Set appropriate default values for REPO vars

REPO_OWNER, MAIN_REPO, and NIGHTLY_RELEASE_REPO now default to
'atom', 'atom' and 'atom-nightly-releases', respectively.
---
 script/vsts/get-release-version.js | 4 ++--
 script/vsts/lib/release-notes.js   | 6 +++---
 script/vsts/upload-artifacts.js    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js
index 1195da4c456..8c7b099c97e 100644
--- a/script/vsts/get-release-version.js
+++ b/script/vsts/get-release-version.js
@@ -4,8 +4,8 @@ const request = require('request-promise-native');
 const repositoryRootPath = path.resolve(__dirname, '..', '..');
 const appMetadata = require(path.join(repositoryRootPath, 'package.json'));
 
-const REPO_OWNER = process.env.REPO_OWNER;
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO;
+const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom';
+const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases';
 
 const yargs = require('yargs');
 const argv = yargs
diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js
index 5cf139fe905..17fd056c031 100644
--- a/script/vsts/lib/release-notes.js
+++ b/script/vsts/lib/release-notes.js
@@ -3,9 +3,9 @@ const octokit = require('@octokit/rest')();
 const changelog = require('pr-changelog');
 const childProcess = require('child_process');
 
-const REPO_OWNER = process.env.REPO_OWNER;
-const MAIN_REPO = process.env.MAIN_REPO;
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO;
+const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom';
+const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom';
+const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases';
 
 module.exports.getRelease = async function(releaseVersion, githubToken) {
   if (githubToken) {
diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js
index 08a3e2d13ec..a9559d1070e 100644
--- a/script/vsts/upload-artifacts.js
+++ b/script/vsts/upload-artifacts.js
@@ -12,9 +12,9 @@ const uploadLinuxPackages = require('./lib/upload-linux-packages');
 
 const CONFIG = require('../config');
 
-const REPO_OWNER = process.env.REPO_OWNER;
-const MAIN_REPO = process.env.MAIN_REPO;
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO;
+const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom';
+const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom';
+const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases';
 
 const yargs = require('yargs');
 const argv = yargs

From d167180bba0ea946214d8d8dd9c60136772b96a8 Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Tue, 4 Aug 2020 14:31:40 -0400
Subject: [PATCH 5/9] :shirt: CI: Fix JS lints (prettier)

---
 script/vsts/get-release-version.js | 4 +++-
 script/vsts/lib/release-notes.js   | 4 +++-
 script/vsts/upload-artifacts.js    | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js
index 8c7b099c97e..f83209b30f7 100644
--- a/script/vsts/get-release-version.js
+++ b/script/vsts/get-release-version.js
@@ -5,7 +5,9 @@ const repositoryRootPath = path.resolve(__dirname, '..', '..');
 const appMetadata = require(path.join(repositoryRootPath, 'package.json'));
 
 const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom';
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases';
+const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO
+  ? process.env.NIGHTLY_RELEASE_REPO
+  : 'atom-nightly-releases';
 
 const yargs = require('yargs');
 const argv = yargs
diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js
index 17fd056c031..a1743e70cfd 100644
--- a/script/vsts/lib/release-notes.js
+++ b/script/vsts/lib/release-notes.js
@@ -5,7 +5,9 @@ const childProcess = require('child_process');
 
 const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom';
 const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom';
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases';
+const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO
+  ? process.env.NIGHTLY_RELEASE_REPO
+  : 'atom-nightly-releases';
 
 module.exports.getRelease = async function(releaseVersion, githubToken) {
   if (githubToken) {
diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js
index a9559d1070e..a8e0849d46e 100644
--- a/script/vsts/upload-artifacts.js
+++ b/script/vsts/upload-artifacts.js
@@ -14,7 +14,9 @@ const CONFIG = require('../config');
 
 const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom';
 const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom';
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO ? process.env.NIGHTLY_RELEASE_REPO : 'atom-nightly-releases';
+const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO
+  ? process.env.NIGHTLY_RELEASE_REPO
+  : 'atom-nightly-releases';
 
 const yargs = require('yargs');
 const argv = yargs

From a24e93acf26a0b101bc14168e75d98e608efbfb0 Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Tue, 4 Aug 2020 22:35:16 -0400
Subject: [PATCH 6/9] CI: Update displayNames for Windows jobs

---
 script/vsts/platforms/windows.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml
index ac7a53aead7..4613b934d7b 100644
--- a/script/vsts/platforms/windows.yml
+++ b/script/vsts/platforms/windows.yml
@@ -1,5 +1,6 @@
 jobs:
   - job: Windows_build
+    displayName: Windows build
     dependsOn: GetReleaseVersion
     timeoutInMinutes: 180
     strategy:
@@ -71,6 +72,7 @@ jobs:
               condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
 
   - job: Windows_RendererTests
+    displayName: Windows
     dependsOn: Windows_build
     timeoutInMinutes: 180
     strategy:

From d5c8456e2ad7ebda19cb4c60baadb66b9fdab7ee Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Wed, 5 Aug 2020 09:57:31 -0400
Subject: [PATCH 7/9] CI: Use more-compact "default var" syntax in JS

Co-authored-by: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
---
 script/vsts/get-release-version.js | 6 ++----
 script/vsts/lib/release-notes.js   | 8 +++-----
 script/vsts/upload-artifacts.js    | 8 +++-----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js
index f83209b30f7..28ca977b6ee 100644
--- a/script/vsts/get-release-version.js
+++ b/script/vsts/get-release-version.js
@@ -4,10 +4,8 @@ const request = require('request-promise-native');
 const repositoryRootPath = path.resolve(__dirname, '..', '..');
 const appMetadata = require(path.join(repositoryRootPath, 'package.json'));
 
-const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom';
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO
-  ? process.env.NIGHTLY_RELEASE_REPO
-  : 'atom-nightly-releases';
+const REPO_OWNER = process.env.REPO_OWNER || 'atom';
+const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
 
 const yargs = require('yargs');
 const argv = yargs
diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js
index a1743e70cfd..552fe1f30eb 100644
--- a/script/vsts/lib/release-notes.js
+++ b/script/vsts/lib/release-notes.js
@@ -3,11 +3,9 @@ const octokit = require('@octokit/rest')();
 const changelog = require('pr-changelog');
 const childProcess = require('child_process');
 
-const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom';
-const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom';
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO
-  ? process.env.NIGHTLY_RELEASE_REPO
-  : 'atom-nightly-releases';
+const REPO_OWNER = process.env.REPO_OWNER || 'atom';
+const MAIN_REPO = process.env.MAIN_REPO || 'atom';
+const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
 
 module.exports.getRelease = async function(releaseVersion, githubToken) {
   if (githubToken) {
diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js
index a8e0849d46e..b3d2a0fd9ac 100644
--- a/script/vsts/upload-artifacts.js
+++ b/script/vsts/upload-artifacts.js
@@ -12,11 +12,9 @@ const uploadLinuxPackages = require('./lib/upload-linux-packages');
 
 const CONFIG = require('../config');
 
-const REPO_OWNER = process.env.REPO_OWNER ? process.env.REPO_OWNER : 'atom';
-const MAIN_REPO = process.env.MAIN_REPO ? process.env.MAIN_REPO : 'atom';
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO
-  ? process.env.NIGHTLY_RELEASE_REPO
-  : 'atom-nightly-releases';
+const REPO_OWNER = process.env.REPO_OWNER || 'atom';
+const MAIN_REPO = process.env.MAIN_REPO || 'atom';
+const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
 
 const yargs = require('yargs');
 const argv = yargs

From 1ee74e56613f84ec2ffd141dc80c99b1672cf3f5 Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Wed, 5 Aug 2020 11:01:59 -0400
Subject: [PATCH 8/9] :shirt: Fix lints again

---
 script/vsts/get-release-version.js | 3 ++-
 script/vsts/lib/release-notes.js   | 3 ++-
 script/vsts/upload-artifacts.js    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js
index 28ca977b6ee..5ddf3659bd6 100644
--- a/script/vsts/get-release-version.js
+++ b/script/vsts/get-release-version.js
@@ -5,7 +5,8 @@ const repositoryRootPath = path.resolve(__dirname, '..', '..');
 const appMetadata = require(path.join(repositoryRootPath, 'package.json'));
 
 const REPO_OWNER = process.env.REPO_OWNER || 'atom';
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
+const NIGHTLY_RELEASE_REPO =
+  process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
 
 const yargs = require('yargs');
 const argv = yargs
diff --git a/script/vsts/lib/release-notes.js b/script/vsts/lib/release-notes.js
index 552fe1f30eb..1901e9a16d1 100644
--- a/script/vsts/lib/release-notes.js
+++ b/script/vsts/lib/release-notes.js
@@ -5,7 +5,8 @@ const childProcess = require('child_process');
 
 const REPO_OWNER = process.env.REPO_OWNER || 'atom';
 const MAIN_REPO = process.env.MAIN_REPO || 'atom';
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
+const NIGHTLY_RELEASE_REPO =
+  process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
 
 module.exports.getRelease = async function(releaseVersion, githubToken) {
   if (githubToken) {
diff --git a/script/vsts/upload-artifacts.js b/script/vsts/upload-artifacts.js
index b3d2a0fd9ac..ed7530921e6 100644
--- a/script/vsts/upload-artifacts.js
+++ b/script/vsts/upload-artifacts.js
@@ -14,7 +14,8 @@ const CONFIG = require('../config');
 
 const REPO_OWNER = process.env.REPO_OWNER || 'atom';
 const MAIN_REPO = process.env.MAIN_REPO || 'atom';
-const NIGHTLY_RELEASE_REPO = process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
+const NIGHTLY_RELEASE_REPO =
+  process.env.NIGHTLY_RELEASE_REPO || 'atom-nightly-releases';
 
 const yargs = require('yargs');
 const argv = yargs

From cfd4a0b2ce0977acc493517a841aa55f2ebb77a1 Mon Sep 17 00:00:00 2001
From: DeeDeeG <DeeDeeG@users.noreply.github.com>
Date: Wed, 12 Aug 2020 19:53:31 -0400
Subject: [PATCH 9/9] CI: Drop old workaround, refactor script blocks

This old bug in the CI inexplicably went away at some point.
---
 script/vsts/nightly-release.yml      | 7 +------
 script/vsts/pull-requests.yml        | 5 +----
 script/vsts/release-branch-build.yml | 7 +------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml
index 774abb7bb62..4e19f593cea 100644
--- a/script/vsts/nightly-release.yml
+++ b/script/vsts/nightly-release.yml
@@ -3,13 +3,10 @@ jobs:
     pool:
       vmImage: 'ubuntu-latest'
     steps:
-      # This has to be done separately because VSTS inexplicably
-      # exits the script block after `npm ci` completes.
       - script: |
           cd script/vsts
           npm ci
-        displayName: npm ci
-      - script: node script/vsts/get-release-version.js --nightly
+          node get-release-version.js --nightly
         name: Version
 
   # Import OS-specific build definitions
@@ -34,8 +31,6 @@ jobs:
     steps:
       - template: platforms/templates/preparation.yml
 
-       #This has to be done separately because VSTS inexplicably
-       #exits the script block after `npm ci` completes.
       - script: |
           cd script/vsts
           npm ci
diff --git a/script/vsts/pull-requests.yml b/script/vsts/pull-requests.yml
index 82367ca058c..b92de1622de 100644
--- a/script/vsts/pull-requests.yml
+++ b/script/vsts/pull-requests.yml
@@ -5,13 +5,10 @@ jobs:
     pool:
       vmImage: 'ubuntu-latest'
     steps:
-      # This has to be done separately because VSTS inexplicably
-      # exits the script block after `npm ci` completes.
       - script: |
           cd script/vsts
           npm ci
-        displayName: npm ci
-      - script: node script/vsts/get-release-version.js
+          node get-release-version.js
         name: Version
 
   # Import OS-specific build definitions
diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml
index 6d4774d8875..24b1e44b99d 100644
--- a/script/vsts/release-branch-build.yml
+++ b/script/vsts/release-branch-build.yml
@@ -9,13 +9,10 @@ jobs:
     pool:
       vmImage: 'ubuntu-latest'
     steps:
-      # This has to be done separately because VSTS inexplicably
-      # exits the script block after `npm ci` completes.
       - script: |
           cd script/vsts
           npm ci
-        displayName: npm ci
-      - script: node script/vsts/get-release-version.js
+          node get-release-version.js
         name: Version
 
   # Import OS-specific build definitions.
@@ -39,8 +36,6 @@ jobs:
       IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
     steps:
-      # This has to be done separately because VSTS inexplicably
-      # exits the script block after `npm ci` completes.
       - script: |
           cd script/vsts
           npm ci