Fix release build pipeline

A backlog task of removing the `findPsesBuild` script and associated logic
caused us to end up with a release with the wrong artifacts. The tagged PSES
build was partially succeeded, which the download task then ignored as the
trigger, and instead of failing, fell back to this script which gave it the
latest fully succeeded build (an old version of PSES).

That PSES build was only partially successful because the "Install PowerShell
Daily" step failed due to a transient network error, and so this was
intentionally ignored as it did not affect the build. Or so we thought.

Author: andyleejordan

.vsts-ci/azure-pipelines-ci.yml

@@ -13,24 +13,6 @@ trigger:
   branches:
     include:
       - master
-      - legacy/1.x
-  paths:
-    exclude:
-      - /.dependabot/*
-      - /.poshchan/*
-      - /.github/**/*
-      - /.vscode/**/*
-      - /.vsts-ci/misc-analysis.yml
-      - /tools/**/*
-      - .editorconfig
-      - .gitattributes
-      - .gitignore
-      - /docs/**/*
-      - /CHANGELOG.md
-      - /CONTRIBUTING.md
-      - /README.md
-      - /LICENSE
-      - /CODE_OF_CONDUCT.md
 
 jobs:
 - job: Windows

.vsts-ci/azure-pipelines-release.yml

@@ -1,5 +1,3 @@
-name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
-
 variables:
   # Don't download unneeded packages
   - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
@@ -9,28 +7,9 @@ variables:
     value: 'true'
 
 trigger:
-  batch: true
   branches:
     include:
-      - master
-      - legacy/1.x
-  paths:
-    exclude:
-      - /.dependabot/*
-      - /.poshchan/*
-      - /.github/**/*
-      - /.vscode/**/*
-      - /.vsts-ci/misc-analysis.yml
-      - /tools/**/*
-      - .editorconfig
-      - .gitattributes
-      - .gitignore
-      - /docs/**/*
-      - /CHANGELOG.md
-      - /CONTRIBUTING.md
-      - /README.md
-      - /LICENSE
-      - /CODE_OF_CONDUCT.md
+      - release/*
 
 resources:
   repositories:
@@ -43,13 +22,12 @@ resources:
     source: PowerShellEditorServices
     trigger:
       branches:
-      - master
-      - releases/*
-      - changelog*
-      - refs/tags/*
+        include:
+        - release/*
+      tags:
+      - v*
 
 jobs:
-
 - job: 'ReleaseBuild'
   displayName: 'Build release'
   pool:

.vsts-ci/templates/ci-general.yml

@@ -13,33 +13,35 @@ steps:
       Write-Host "##vso[task.prependpath]$powerShellPath"
     continueOnError: true
     displayName: Install PowerShell Daily
+
   - pwsh: '$PSVersionTable'
     displayName: Display PowerShell version information
+
   - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
     displayName: Set Build Name for Non-PR
     condition: ne(variables['Build.Reason'], 'PullRequest')
-  - task: PowerShell@2
-    displayName: 'Set environment variables for VSTS (Phase 1)'
-    inputs:
-      targetType: filePath
-      filePath: ./tools/releaseBuild/setVstsVariables.ps1
+
+    # TODO: Use a submodule or some such so we can actually track a version here.
   - pwsh: |
-      Write-Host "Cloning '$env:PSES_BRANCH' branch from '$env:PSES_FORK/PowerShellEditorServices'"
-      git clone --single-branch --branch $env:PSES_BRANCH https://github.com/$env:PSES_FORK/PowerShellEditorServices.git ../PowerShellEditorServices
+      git clone https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices
       Install-Module InvokeBuild -Scope CurrentUser -Force
       Install-Module PlatyPS -Scope CurrentUser -Force
       New-Item -ItemType Directory $(Build.ArtifactStagingDirectory)/vscode-powershell
+
   # Build
   - pwsh: Invoke-Build
+
   - task: PublishTestResults@2
     inputs:
       testRunner: JUnit
       testResultsFiles: '**/test-results.xml'
     condition: succeededOrFailed()
+
   - task: PublishBuildArtifacts@1
     inputs:
       ArtifactName: vscode-powershell
       PathtoPublish: '$(Build.ArtifactStagingDirectory)/vscode-powershell'
+
   # Rich Navigation
   - task: RichCodeNavIndexer@0
     # Note, for now, this is Windows only.

.vsts-ci/templates/release-general.yml

@@ -1,40 +1,19 @@
 steps:
 - checkout: self
 
-- pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
-  displayName: Set Build Name for Non-PR
-  condition: ne(variables['Build.Reason'], 'PullRequest')
-
 - pwsh: |
     Get-ChildItem -Path env:
   displayName: Capture environment
   condition: succeededOrFailed()
 
-# TODO: Use modern resources for these variables.
-- task: PowerShell@2
-  displayName: 'Set environment variables for VSTS (Phase 1)'
-  inputs:
-    targetType: filePath
-    filePath: ./vscode-powershell/tools/releaseBuild/setVstsVariables.ps1
-
-# TODO: Remove this when satisfied with added trigger.
-- task: PowerShell@2
-  displayName: 'Find PowerShellEditorServices build'
-  env:
-    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-  inputs:
-    targetType: filePath
-    filePath: ./vscode-powershell/tools/releaseBuild/findPsesBuild.ps1
-
 - task: DownloadPipelineArtifact@2
-  displayName: 'Download Artifacts from PowerShell Editor Services'
+  displayName: 'Download Artifacts from PowerShellEditorServices'
   inputs:
     source: specific
     project: '8e2735c1-3674-408a-bcab-87f089ea29d5'
     pipeline: 1056
     preferTriggeringPipeline: true
-    runVersion: specific
-    runId: '$(PSES_BUILDID)'
+    allowPartiallySucceededBuilds: true
     artifact: 'PowerShellEditorServices'
     path: '$(Build.SourcesDirectory)/PowerShellEditorServices/module/'
 

CHANGELOG.md

@@ -15,6 +15,12 @@
 
 #### [PowerShellEditorServices](https://github.com/PowerShell/PowerShellEditorServices)
 
+Please note that these changes were intended to be included in this preview
+release; however, a silent pipeline failure led to the previous version of
+PowerShellEditorServices being included instead. These changes will be included
+in the next preview release. See:
+[#3282](https://github.com/PowerShell/vscode-powershell/issues/3282)
+
 - 🧠✨ [PowerShellEditorServices #1176](https://github.com/PowerShell/PowerShellEditorServices/pull/1427) - Add '$' as trigger character for completion. (Thanks @MartinGC94!)
 - 👷🚨✨ [PowerShellEditorServices #1426](https://github.com/PowerShell/PowerShellEditorServices/pull/1426) - Bump CI images and enable tests on Apple M1.
 - ✨ [PowerShellEditorServices #1424](https://github.com/PowerShell/PowerShellEditorServices/pull/1424) - Update to use OmniSharp 0.19.0.