From 1e21bd6f6c2e51fe76b188a37ffe02e4e9ebc710 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Mon, 17 Jun 2019 12:25:07 -0700 Subject: [PATCH 1/2] Fix gulp versions --- test/common/markdown/markdown.tests.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/common/markdown/markdown.tests.ps1 b/test/common/markdown/markdown.tests.ps1 index 05f759d7017..2f3990d6d61 100644 --- a/test/common/markdown/markdown.tests.ps1 +++ b/test/common/markdown/markdown.tests.ps1 @@ -18,11 +18,10 @@ Describe 'Common Tests - Validate Markdown Files' -Tag 'CI' { $NpmInstalled = "Installed" Write-Verbose -Message "NPM is checking Gulp is installed. This may take a few moments." -Verbose start-nativeExecution { yarn } - start-nativeExecution { yarn add gulp@4.0.0 } if(!(Get-Command -Name 'gulp' -ErrorAction SilentlyContinue)) { start-nativeExecution { - sudo yarn global add 'gulp@4.0.0' + sudo yarn global add 'gulp@4.0.2' } } if(!(Get-Command -Name 'node' -ErrorAction SilentlyContinue)) From fbce23a04e68add12141666064dbd85cdebb66d4 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Tue, 18 Jun 2019 11:03:12 -0400 Subject: [PATCH 2/2] check for yarn instead --- test/common/markdown/markdown.tests.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/common/markdown/markdown.tests.ps1 b/test/common/markdown/markdown.tests.ps1 index 2f3990d6d61..e48ec0c9f2c 100644 --- a/test/common/markdown/markdown.tests.ps1 +++ b/test/common/markdown/markdown.tests.ps1 @@ -13,10 +13,10 @@ Describe 'Common Tests - Validate Markdown Files' -Tag 'CI' { Push-Location $psscriptroot $skip = $false $NpmInstalled = "not installed" - if (Get-Command -Name 'npm' -ErrorAction SilentlyContinue) + if (Get-Command -Name 'yarn' -ErrorAction SilentlyContinue) { $NpmInstalled = "Installed" - Write-Verbose -Message "NPM is checking Gulp is installed. This may take a few moments." -Verbose + Write-Verbose -Message "Checking if Gulp is installed. This may take a few moments." -Verbose start-nativeExecution { yarn } if(!(Get-Command -Name 'gulp' -ErrorAction SilentlyContinue)) { @@ -36,7 +36,7 @@ Describe 'Common Tests - Validate Markdown Files' -Tag 'CI' { For now we will skip, and write a warning. Work to resolve this is tracked in: https://github.com/PowerShell/PowerShell/issues/3429 #> - Write-Warning "Node and npm are required to run this test" + Write-Warning "Node and yarn are required to run this test" $skip = $true }