From ce2b188798d0a8e7cab1fa849d9253b5ec92d291 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 22:19:49 +0100 Subject: [PATCH 01/17] POC of conditionally using daily in one job --- .azure-pipelines-ci/ci.yaml | 3 +++ .azure-pipelines-ci/templates/test.yaml | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index 71ec55030..3d4a1b40b 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -27,6 +27,9 @@ stages: matrix: Ubuntu_16_04: vmImage: ubuntu-16.04 + Ubuntu_16_04: + vmImage: ubuntu-16.04 + pwsh-preview: true Ubuntu_18_04: vmImage: ubuntu-18.04 macOS_10_14_Mojave: diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index 2acdcc6f5..fdf1814d0 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -2,6 +2,9 @@ parameters: - name: pwsh type: boolean default: true +- name: pwsh-preview + type: boolean + default: false steps: - task: DownloadPipelineArtifact@2 @@ -9,6 +12,18 @@ steps: inputs: artifactName: out targetPath: '$(Build.SourcesDirectory)/out' +- pwsh: | + Write-Host "Installing PowerShell Daily..." + # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up. + $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell' + Invoke-WebRequest -Uri https://aka.ms/install-powershell.ps1 -OutFile ./install-powershell.ps1 + ./install-powershell.ps1 -Destination $powerShellPath -Daily + # Using `prependpath` to update the PATH just for this build. + Write-Host "##vso[task.prependpath]$powerShellPath" + displayName: Install PowerShell Daily + condition: eq(${{ parameters.pwsh-preview }}, true) +- pwsh: '$PSVersionTable' + displayName: Display PowerShell version information - task: PowerShell@2 displayName: 'Test' inputs: From 98b1e5c7cd2735099d32f75044cd669f876e1ae3 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 22:20:35 +0100 Subject: [PATCH 02/17] fix yaml --- .azure-pipelines-ci/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index 3d4a1b40b..9ff497e5e 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -28,7 +28,7 @@ stages: Ubuntu_16_04: vmImage: ubuntu-16.04 Ubuntu_16_04: - vmImage: ubuntu-16.04 + vmImage: ubuntu-16.04-preview pwsh-preview: true Ubuntu_18_04: vmImage: ubuntu-18.04 From 59b1c9b4c751ab1e210022095e518bc02877320f Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 22:21:28 +0100 Subject: [PATCH 03/17] fix --- .azure-pipelines-ci/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index 9ff497e5e..2d91b2a53 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -27,8 +27,8 @@ stages: matrix: Ubuntu_16_04: vmImage: ubuntu-16.04 - Ubuntu_16_04: - vmImage: ubuntu-16.04-preview + Ubuntu_16_04_preview: + vmImage: ubuntu-16.04 pwsh-preview: true Ubuntu_18_04: vmImage: ubuntu-18.04 From e0e7f2680a4fa4ebf32dc1de234593c5f0326a75 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 22:22:30 +0100 Subject: [PATCH 04/17] underscore --- .azure-pipelines-ci/ci.yaml | 2 +- .azure-pipelines-ci/templates/test.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index 2d91b2a53..1741035c8 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -29,7 +29,7 @@ stages: vmImage: ubuntu-16.04 Ubuntu_16_04_preview: vmImage: ubuntu-16.04 - pwsh-preview: true + pwsh_preview: true Ubuntu_18_04: vmImage: ubuntu-18.04 macOS_10_14_Mojave: diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index fdf1814d0..ef515c1d9 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -2,7 +2,7 @@ parameters: - name: pwsh type: boolean default: true -- name: pwsh-preview +- name: pwsh_preview type: boolean default: false @@ -21,7 +21,7 @@ steps: # Using `prependpath` to update the PATH just for this build. Write-Host "##vso[task.prependpath]$powerShellPath" displayName: Install PowerShell Daily - condition: eq(${{ parameters.pwsh-preview }}, true) + condition: eq(${{ parameters.pwsh_preview }}, true) - pwsh: '$PSVersionTable' displayName: Display PowerShell version information - task: PowerShell@2 From 8871aa6755b95f71422e9527c7cabbb79f887bf4 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 22:29:42 +0100 Subject: [PATCH 05/17] use condition more directly --- .azure-pipelines-ci/templates/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index ef515c1d9..1111d7da4 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -21,7 +21,7 @@ steps: # Using `prependpath` to update the PATH just for this build. Write-Host "##vso[task.prependpath]$powerShellPath" displayName: Install PowerShell Daily - condition: eq(${{ parameters.pwsh_preview }}, true) + condition: ${{ parameters.pwsh_preview }} - pwsh: '$PSVersionTable' displayName: Display PowerShell version information - task: PowerShell@2 From 7e6cb66f0d1ce6f88d371c8146c75b014d6ab6c7 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 22:36:05 +0100 Subject: [PATCH 06/17] no underscore in param name --- .azure-pipelines-ci/ci.yaml | 2 +- .azure-pipelines-ci/templates/test.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index 1741035c8..70aa1f176 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -29,7 +29,7 @@ stages: vmImage: ubuntu-16.04 Ubuntu_16_04_preview: vmImage: ubuntu-16.04 - pwsh_preview: true + preview: true Ubuntu_18_04: vmImage: ubuntu-18.04 macOS_10_14_Mojave: diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index 1111d7da4..0d2911bca 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -2,7 +2,7 @@ parameters: - name: pwsh type: boolean default: true -- name: pwsh_preview +- name: preview type: boolean default: false @@ -21,7 +21,7 @@ steps: # Using `prependpath` to update the PATH just for this build. Write-Host "##vso[task.prependpath]$powerShellPath" displayName: Install PowerShell Daily - condition: ${{ parameters.pwsh_preview }} + condition: ${{ parameters.preview }} - pwsh: '$PSVersionTable' displayName: Display PowerShell version information - task: PowerShell@2 From 5d86c40745622444de6c1acf17ea60490ba82ea0 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 22:51:03 +0100 Subject: [PATCH 07/17] set env var --- .azure-pipelines-ci/ci.yaml | 6 +++--- .azure-pipelines-ci/templates/test.yaml | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index 70aa1f176..a1dd8a79a 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -29,7 +29,7 @@ stages: vmImage: ubuntu-16.04 Ubuntu_16_04_preview: vmImage: ubuntu-16.04 - preview: true + PowerShellVersion: Preview Ubuntu_18_04: vmImage: ubuntu-18.04 macOS_10_14_Mojave: @@ -42,10 +42,10 @@ stages: vmImage: windows-2019 Windows_Server2016_PowerShell_5_1: vmImage: vs2017-win2016 - pwsh: false + PowerShellVersion: WindowsPowerShell Windows_Server2019_PowerShell_5_1: vmImage: windows-2019 - pwsh: false + PowerShellVersion: WindowsPowerShell pool: vmImage: $[ variables['vmImage'] ] steps: diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index 0d2911bca..d963e20e3 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -1,10 +1,11 @@ parameters: -- name: pwsh - type: boolean - default: true -- name: preview - type: boolean - default: false +- name: PowerShellVersion + type: string + default: LTS + values: + - WindowsPowerShell + - LTS + - Preview steps: - task: DownloadPipelineArtifact@2 @@ -12,6 +13,9 @@ steps: inputs: artifactName: out targetPath: '$(Build.SourcesDirectory)/out' +- pwsh: | + Write-Host "##vso[task.setvariable variable=parameters.PowerShellVersion]${{ parameters.PowerShellVersion }}" + displayName: 'Set parameters.PowerShellVersion environment variable' - pwsh: | Write-Host "Installing PowerShell Daily..." # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up. @@ -21,14 +25,14 @@ steps: # Using `prependpath` to update the PATH just for this build. Write-Host "##vso[task.prependpath]$powerShellPath" displayName: Install PowerShell Daily - condition: ${{ parameters.preview }} + condition: eq( '${{ parameters.preview }}' , 'Preview') - pwsh: '$PSVersionTable' displayName: Display PowerShell version information - task: PowerShell@2 displayName: 'Test' inputs: targetType: inline - pwsh: ${{ parameters.pwsh }} + pwsh: ne( '${{ parameters.PowerShellVersion }}', 'WindowsPowerShell') script: | Import-Module .\tools\appveyor.psm1 Invoke-AppveyorTest -CheckoutPath $env:BUILD_SOURCESDIRECTORY From ff9556c141099a035ca60a5318a79dbc5809bb92 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 22:54:07 +0100 Subject: [PATCH 08/17] fix --- .azure-pipelines-ci/ci.yaml | 3 +++ .azure-pipelines-ci/templates/test.yaml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index a1dd8a79a..d5e5751f2 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -32,6 +32,9 @@ stages: PowerShellVersion: Preview Ubuntu_18_04: vmImage: ubuntu-18.04 + Ubuntu_18_04_preview: + vmImage: ubuntu-18.04 + PowerShellVersion: Preview macOS_10_14_Mojave: vmImage: macOS-10.14 macOS_10_15_Catalina: diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index d963e20e3..12e968320 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -17,15 +17,15 @@ steps: Write-Host "##vso[task.setvariable variable=parameters.PowerShellVersion]${{ parameters.PowerShellVersion }}" displayName: 'Set parameters.PowerShellVersion environment variable' - pwsh: | - Write-Host "Installing PowerShell Daily..." + Write-Host "Installing PowerShell Preview..." # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up. $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell' Invoke-WebRequest -Uri https://aka.ms/install-powershell.ps1 -OutFile ./install-powershell.ps1 - ./install-powershell.ps1 -Destination $powerShellPath -Daily + ./install-powershell.ps1 -Destination $powerShellPath -Preview # Using `prependpath` to update the PATH just for this build. Write-Host "##vso[task.prependpath]$powerShellPath" displayName: Install PowerShell Daily - condition: eq( '${{ parameters.preview }}' , 'Preview') + condition: eq( '${{ parameters.PowerShellVersion }}' , 'Preview') - pwsh: '$PSVersionTable' displayName: Display PowerShell version information - task: PowerShell@2 From ee8ffa265f64642594f771fffadc6493f47c86a6 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 23:01:27 +0100 Subject: [PATCH 09/17] use env for condition --- .azure-pipelines-ci/ci.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index d5e5751f2..ad6a6f06d 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -15,11 +15,11 @@ stages: ./build.ps1 -Configuration 'Release' -All ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' displayName: 'Full Build' - - task: PublishPipelineArtifact@1 - displayName: 'Publish Pipeline Artifact: out Folder' - inputs: - targetPath: '$(Build.SourcesDirectory)/out' - artifactName: out + # - task: PublishPipelineArtifact@1 + # displayName: 'Publish Pipeline Artifact: out Folder' + # inputs: + # targetPath: '$(Build.SourcesDirectory)/out' + # artifactName: out - stage: Test jobs: - job: @@ -29,12 +29,12 @@ stages: vmImage: ubuntu-16.04 Ubuntu_16_04_preview: vmImage: ubuntu-16.04 - PowerShellVersion: Preview + PowerShellVersion: 'Preview' Ubuntu_18_04: vmImage: ubuntu-18.04 Ubuntu_18_04_preview: vmImage: ubuntu-18.04 - PowerShellVersion: Preview + PowerShellVersion: 'Preview' macOS_10_14_Mojave: vmImage: macOS-10.14 macOS_10_15_Catalina: From 0254ba485bc6563a7c9654d053b2e0d4579589b6 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 23:02:30 +0100 Subject: [PATCH 10/17] make build faster --- .azure-pipelines-ci/ci.yaml | 16 ++++++++-------- .azure-pipelines-ci/templates/test.yaml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index ad6a6f06d..db2a42ca6 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -11,15 +11,15 @@ stages: steps: - pwsh: | Import-Module .\tools\appveyor.psm1 - Invoke-AppveyorInstall -SkipPesterInstallation - ./build.ps1 -Configuration 'Release' -All - ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' + # Invoke-AppveyorInstall -SkipPesterInstallation + # ./build.ps1 -Configuration 'Release' -All + # ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' displayName: 'Full Build' - # - task: PublishPipelineArtifact@1 - # displayName: 'Publish Pipeline Artifact: out Folder' - # inputs: - # targetPath: '$(Build.SourcesDirectory)/out' - # artifactName: out + - task: PublishPipelineArtifact@1 + displayName: 'Publish Pipeline Artifact: out Folder' + inputs: + targetPath: '$(Build.SourcesDirectory)/out' + artifactName: out - stage: Test jobs: - job: diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index 12e968320..a0d5dc415 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -25,7 +25,7 @@ steps: # Using `prependpath` to update the PATH just for this build. Write-Host "##vso[task.prependpath]$powerShellPath" displayName: Install PowerShell Daily - condition: eq( '${{ parameters.PowerShellVersion }}' , 'Preview') + condition: eq($(parameters.PowerShellVersion), 'Preview') - pwsh: '$PSVersionTable' displayName: Display PowerShell version information - task: PowerShell@2 From 6b9f9e394b9d002472b83e043a674f72a0223656 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 23:04:09 +0100 Subject: [PATCH 11/17] fix --- .azure-pipelines-ci/ci.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index db2a42ca6..f48eaac3a 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -11,6 +11,7 @@ stages: steps: - pwsh: | Import-Module .\tools\appveyor.psm1 + mkdir out # Invoke-AppveyorInstall -SkipPesterInstallation # ./build.ps1 -Configuration 'Release' -All # ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' @@ -29,12 +30,12 @@ stages: vmImage: ubuntu-16.04 Ubuntu_16_04_preview: vmImage: ubuntu-16.04 - PowerShellVersion: 'Preview' + PowerShellVersion: Preview Ubuntu_18_04: vmImage: ubuntu-18.04 Ubuntu_18_04_preview: vmImage: ubuntu-18.04 - PowerShellVersion: 'Preview' + PowerShellVersion: Preview macOS_10_14_Mojave: vmImage: macOS-10.14 macOS_10_15_Catalina: From e19753f47b924f3b137a3cc4db31a230d7541e33 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 23:07:51 +0100 Subject: [PATCH 12/17] fix condition --- .azure-pipelines-ci/templates/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index a0d5dc415..3b064324c 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -25,7 +25,7 @@ steps: # Using `prependpath` to update the PATH just for this build. Write-Host "##vso[task.prependpath]$powerShellPath" displayName: Install PowerShell Daily - condition: eq($(parameters.PowerShellVersion), 'Preview') + condition: eq(variables['parameters.PowerShellVersion'], 'Preview') - pwsh: '$PSVersionTable' displayName: Display PowerShell version information - task: PowerShell@2 From fbffe3baeda42fbb4d620a45b0572c695a6820b4 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 23:12:19 +0100 Subject: [PATCH 13/17] try fix --- .azure-pipelines-ci/templates/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index 3b064324c..5bedb30a8 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -14,8 +14,8 @@ steps: artifactName: out targetPath: '$(Build.SourcesDirectory)/out' - pwsh: | - Write-Host "##vso[task.setvariable variable=parameters.PowerShellVersion]${{ parameters.PowerShellVersion }}" - displayName: 'Set parameters.PowerShellVersion environment variable' + Write-Host "##vso[task.setvariable variable=PowerShellVersion]${{ parameters.PowerShellVersion }}" + displayName: 'Set PowerShellVersion environment variable' - pwsh: | Write-Host "Installing PowerShell Preview..." # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up. @@ -25,7 +25,7 @@ steps: # Using `prependpath` to update the PATH just for this build. Write-Host "##vso[task.prependpath]$powerShellPath" displayName: Install PowerShell Daily - condition: eq(variables['parameters.PowerShellVersion'], 'Preview') + condition: eq(variables['PowerShellVersion'], 'Preview') - pwsh: '$PSVersionTable' displayName: Display PowerShell version information - task: PowerShell@2 From 922a8f39197993a4f66fc2f8dc275c8984f879e2 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 23:15:32 +0100 Subject: [PATCH 14/17] try not set env var --- .azure-pipelines-ci/templates/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index 5bedb30a8..a778d1fa0 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -13,8 +13,8 @@ steps: inputs: artifactName: out targetPath: '$(Build.SourcesDirectory)/out' -- pwsh: | - Write-Host "##vso[task.setvariable variable=PowerShellVersion]${{ parameters.PowerShellVersion }}" +# - pwsh: | +# Write-Host "##vso[task.setvariable variable=PowerShellVersion]${{ parameters.PowerShellVersion }}" displayName: 'Set PowerShellVersion environment variable' - pwsh: | Write-Host "Installing PowerShell Preview..." From 010cf5422e07f5ff34c1e20f4d3f3750a6451fbd Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 23:17:16 +0100 Subject: [PATCH 15/17] ix yaml --- .azure-pipelines-ci/templates/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index a778d1fa0..064470d0a 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -15,7 +15,7 @@ steps: targetPath: '$(Build.SourcesDirectory)/out' # - pwsh: | # Write-Host "##vso[task.setvariable variable=PowerShellVersion]${{ parameters.PowerShellVersion }}" - displayName: 'Set PowerShellVersion environment variable' + # displayName: 'Set PowerShellVersion environment variable' - pwsh: | Write-Host "Installing PowerShell Preview..." # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up. From 1ade82caed55585e1068800ed7c66998ca652e64 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Wed, 8 Apr 2020 23:31:41 +0100 Subject: [PATCH 16/17] finalize --- .azure-pipelines-ci/ci.yaml | 33 ++++++++++++++++--------- .azure-pipelines-ci/templates/test.yaml | 5 +--- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml index f48eaac3a..ea54c7c57 100644 --- a/.azure-pipelines-ci/ci.yaml +++ b/.azure-pipelines-ci/ci.yaml @@ -11,10 +11,9 @@ stages: steps: - pwsh: | Import-Module .\tools\appveyor.psm1 - mkdir out - # Invoke-AppveyorInstall -SkipPesterInstallation - # ./build.ps1 -Configuration 'Release' -All - # ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' + Invoke-AppveyorInstall -SkipPesterInstallation + ./build.ps1 -Configuration 'Release' -All + ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' displayName: 'Full Build' - task: PublishPipelineArtifact@1 displayName: 'Publish Pipeline Artifact: out Folder' @@ -28,26 +27,38 @@ stages: matrix: Ubuntu_16_04: vmImage: ubuntu-16.04 - Ubuntu_16_04_preview: + Ubuntu_16_04_PSPreview: vmImage: ubuntu-16.04 PowerShellVersion: Preview Ubuntu_18_04: vmImage: ubuntu-18.04 - Ubuntu_18_04_preview: + Ubuntu_18_04_PSPreview: vmImage: ubuntu-18.04 PowerShellVersion: Preview macOS_10_14_Mojave: vmImage: macOS-10.14 + macOS_10_14_PSPreview: + vmImage: macOS-10.14 + PowerShellVersion: Preview macOS_10_15_Catalina: vmImage: macOS-10.15 - Windows_Server2016_PowerShell_Core: + macOS_10_15_PSPreview: + vmImage: macOS-10.15 + PowerShellVersion: Preview + Win2016: vmImage: vs2017-win2016 - Windows_Server2019_PowerShell_Core: - vmImage: windows-2019 - Windows_Server2016_PowerShell_5_1: + Win2016_PSPreview: + vmImage: vs2017-win2016 + PowerShellVersion: Preview + Win2016_PowerShell_5_1: vmImage: vs2017-win2016 PowerShellVersion: WindowsPowerShell - Windows_Server2019_PowerShell_5_1: + Win2019: + vmImage: windows-2019 + Win2019_PSPreview: + vmImage: windows-2019 + PowerShellVersion: Preview + Win2019_PS5: vmImage: windows-2019 PowerShellVersion: WindowsPowerShell pool: diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index 064470d0a..ab9249d66 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -13,9 +13,6 @@ steps: inputs: artifactName: out targetPath: '$(Build.SourcesDirectory)/out' -# - pwsh: | -# Write-Host "##vso[task.setvariable variable=PowerShellVersion]${{ parameters.PowerShellVersion }}" - # displayName: 'Set PowerShellVersion environment variable' - pwsh: | Write-Host "Installing PowerShell Preview..." # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up. @@ -32,7 +29,7 @@ steps: displayName: 'Test' inputs: targetType: inline - pwsh: ne( '${{ parameters.PowerShellVersion }}', 'WindowsPowerShell') + pwsh: ne(variables['PowerShellVersion'], 'WindowsPowerShell') script: | Import-Module .\tools\appveyor.psm1 Invoke-AppveyorTest -CheckoutPath $env:BUILD_SOURCESDIRECTORY From 610b42b9bc8c9c6a590d4bb8a7009e90f68775bf Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Sun, 12 Apr 2020 21:23:11 +0100 Subject: [PATCH 17/17] try daily --- .azure-pipelines-ci/templates/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml index ab9249d66..c5c5fd894 100644 --- a/.azure-pipelines-ci/templates/test.yaml +++ b/.azure-pipelines-ci/templates/test.yaml @@ -18,7 +18,7 @@ steps: # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up. $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell' Invoke-WebRequest -Uri https://aka.ms/install-powershell.ps1 -OutFile ./install-powershell.ps1 - ./install-powershell.ps1 -Destination $powerShellPath -Preview + ./install-powershell.ps1 -Destination $powerShellPath -Daily # Using `prependpath` to update the PATH just for this build. Write-Host "##vso[task.prependpath]$powerShellPath" displayName: Install PowerShell Daily