From dc2f6f851313745ccbd7f2325fa1359fa4a668ec Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 11 Sep 2020 10:38:02 -0500 Subject: [PATCH] CI: Drop old workaround, refactor script blocks This old bug in the CI inexplicably went away at some point. Co-Authored-By: DeeDeeG --- script/vsts/nightly-release.yml | 2 -- script/vsts/platforms/templates/get-release-version.yml | 8 +------- script/vsts/release-branch-build.yml | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index a6783697e..b41558047 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -26,8 +26,6 @@ jobs: steps: - template: platforms/templates/preparation.yml - #This has to be done separately because VSTS inexplicably - #exits the script block after `npm install` completes. - script: | cd script/vsts npm install diff --git a/script/vsts/platforms/templates/get-release-version.yml b/script/vsts/platforms/templates/get-release-version.yml index 6e8ac4b85..5f2176450 100644 --- a/script/vsts/platforms/templates/get-release-version.yml +++ b/script/vsts/platforms/templates/get-release-version.yml @@ -12,14 +12,8 @@ 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 ${{ parameters.NightlyFlag }} + node get-release-version.js ${{ parameters.NightlyFlag }} name: Version - env: - REPO_OWNER: $(REPO_OWNER) - NIGHTLY_RELEASE_REPO: $(NIGHTLY_RELEASE_REPO) diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml index 684a27f00..2db42ea75 100644 --- a/script/vsts/release-branch-build.yml +++ b/script/vsts/release-branch-build.yml @@ -31,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 install` completes. - script: | cd script/vsts npm install