From b3018ea9410bdfd6391d18fb6c71f7fd031f90cc Mon Sep 17 00:00:00 2001 From: James Truher Date: Fri, 19 Oct 2018 14:07:24 -0700 Subject: [PATCH] reduce build matrix to accellerate CI testing --- appveyor.yml | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 49ed21b69..c9d6f9509 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,15 +2,15 @@ environment: PSVersion: 5 BuildConfiguration: Release matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - PowerShellEdition: PowerShellCore - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - PowerShellEdition: WindowsPowerShell +# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 +# PowerShellEdition: PowerShellCore +# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 +# PowerShellEdition: WindowsPowerShell - APPVEYOR_BUILD_WORKER_IMAGE: WMF 4 PowerShellEdition: WindowsPowerShell PSVersion: 4 - - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - PowerShellEdition: PowerShellCore +# - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu +# PowerShellEdition: PowerShellCore # cache Nuget packages and dotnet CLI cache cache: @@ -19,16 +19,16 @@ cache: install: - ps: if ($env:PowerShellEdition -eq 'WindowsPowerShell') { Import-Module .\tools\appveyor.psm1; Invoke-AppveyorInstall } - pwsh: if ($env:PowerShellEdition -eq 'PowerShellCore') { Import-Module .\tools\appveyor.psm1; Invoke-AppveyorInstall } - - ps: | - # Windows image still has version 6.0.0 of pwsh but 6.0.2 is required due to System.Management.Automation package https://github.com/appveyor/ci/issues/2230 - if ($env:PowerShellEdition -eq 'PowerShellCore' -and $PSVersionTable.PSVersion -lt [version]'6.0.2' -and $IsWindows) { - $msiPath = "$env:TEMP\PowerShell-6.0.2-win-x64.msi" - (New-Object Net.WebClient).DownloadFile('https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-win-x64.msi', $msiPath) - Write-Verbose 'Installing pwsh 6.0.2' -Verbose - Start-Process 'msiexec.exe' -Wait -ArgumentList "/i $msiPath /quiet" - Remove-Item $msiPath - $env:Path = "$env:ProgramFiles\PowerShell\6.0.2;$env:Path" - } +# - ps: | +# # Windows image still has version 6.0.0 of pwsh but 6.0.2 is required due to System.Management.Automation package https://github.com/appveyor/ci/issues/2230 +# if ($env:PowerShellEdition -eq 'PowerShellCore' -and $PSVersionTable.PSVersion -lt [version]'6.0.2' -and $IsWindows) { +# $msiPath = "$env:TEMP\PowerShell-6.0.2-win-x64.msi" +# (New-Object Net.WebClient).DownloadFile('https://github.com/PowerShell/PowerShell/releases/download/v6.0.2/PowerShell-6.0.2-win-x64.msi', $msiPath) +# Write-Verbose 'Installing pwsh 6.0.2' -Verbose +# Start-Process 'msiexec.exe' -Wait -ArgumentList "/i $msiPath /quiet" +# Remove-Item $msiPath +# $env:Path = "$env:ProgramFiles\PowerShell\6.0.2;$env:Path" +# } build_script: - ps: | @@ -40,23 +40,23 @@ build_script: } ./build.ps1 -Configuration "$env:BuildConfiguration" -PSVersion "$env:PSVersion" -Framework full } - - pwsh: | - if ($env:PowerShellEdition -eq 'PowerShellCore') { - Set-Location $env:APPVEYOR_BUILD_FOLDER - ./build.ps1 -Documentation - ./build.ps1 -Configuration "$env:BuildConfiguration" -PSVersion 5 -Framework core - } +# - pwsh: | +# if ($env:PowerShellEdition -eq 'PowerShellCore') { +# Set-Location $env:APPVEYOR_BUILD_FOLDER +# ./build.ps1 -Documentation +# ./build.ps1 -Configuration "$env:BuildConfiguration" -PSVersion 5 -Framework core +# } test_script: - ps: | if ($env:PowerShellEdition -eq 'WindowsPowerShell') { Invoke-AppveyorTest -CheckoutPath $env:APPVEYOR_BUILD_FOLDER } - - pwsh: | - if ($env:PowerShellEdition -eq 'PowerShellCore') { - Import-Module .\tools\appveyor.psm1 # Appveyor does not persist pwsh sessions like it does for ps - Invoke-AppveyorTest -CheckoutPath $env:APPVEYOR_BUILD_FOLDER - } +# - pwsh: | +# if ($env:PowerShellEdition -eq 'PowerShellCore') { +# Import-Module .\tools\appveyor.psm1 # Appveyor does not persist pwsh sessions like it does for ps +# Invoke-AppveyorTest -CheckoutPath $env:APPVEYOR_BUILD_FOLDER +# } # Upload the project along with test results as a zip archive on_finish: