From a6ceca4ab7a20a7e4d76cd9a5a5ebe6e8cd913b0 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Thu, 2 Apr 2020 12:07:46 -0700 Subject: [PATCH 1/4] Specify PSES Branch --- .vsts-ci/templates/ci-general.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.vsts-ci/templates/ci-general.yml b/.vsts-ci/templates/ci-general.yml index d37ef417c5..1417243a59 100644 --- a/.vsts-ci/templates/ci-general.yml +++ b/.vsts-ci/templates/ci-general.yml @@ -3,8 +3,13 @@ steps: - 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 - pwsh: | - git clone https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices + git clone --single-branch --branch $env:PSES_BRANCH https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices Install-Module InvokeBuild -Scope CurrentUser -Force Install-Module PlatyPS -Scope CurrentUser -Force # Build From 38952f717dafd997bc5ea910cd0c30b1bea7b79c Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Thu, 2 Apr 2020 12:10:04 -0700 Subject: [PATCH 2/4] added fork info --- .vsts-ci/templates/ci-general.yml | 2 +- tools/releaseBuild/setVstsVariables.ps1 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.vsts-ci/templates/ci-general.yml b/.vsts-ci/templates/ci-general.yml index 1417243a59..cdcce4b06b 100644 --- a/.vsts-ci/templates/ci-general.yml +++ b/.vsts-ci/templates/ci-general.yml @@ -9,7 +9,7 @@ steps: targetType: filePath filePath: ./tools/releaseBuild/setVstsVariables.ps1 - pwsh: | - git clone --single-branch --branch $env:PSES_BRANCH https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices + git clone --single-branch --branch $env:PSES_BRANCH https://github.com/$env:PSES_FORK/PowerShellEditorServices.git ../PowerShellEditorServices Install-Module InvokeBuild -Scope CurrentUser -Force Install-Module PlatyPS -Scope CurrentUser -Force # Build diff --git a/tools/releaseBuild/setVstsVariables.ps1 b/tools/releaseBuild/setVstsVariables.ps1 index dc42416c73..ace8d35f0b 100644 --- a/tools/releaseBuild/setVstsVariables.ps1 +++ b/tools/releaseBuild/setVstsVariables.ps1 @@ -1,5 +1,6 @@ $vstsVariables = @{ PSES_BRANCH = 'master' + PSES_FORK = 'PowerShell' } # Use VSTS's API to set an env vars From 4d958d2f9e082a6817d62090233f5f56a3046db9 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Thu, 2 Apr 2020 12:26:34 -0700 Subject: [PATCH 3/4] add log --- .vsts-ci/templates/ci-general.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-ci/templates/ci-general.yml b/.vsts-ci/templates/ci-general.yml index cdcce4b06b..9a43cab199 100644 --- a/.vsts-ci/templates/ci-general.yml +++ b/.vsts-ci/templates/ci-general.yml @@ -9,6 +9,7 @@ steps: targetType: filePath filePath: ./tools/releaseBuild/setVstsVariables.ps1 - pwsh: | + Write-Host "Clonning '$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 Install-Module InvokeBuild -Scope CurrentUser -Force Install-Module PlatyPS -Scope CurrentUser -Force From 3cb15bef147e533e2be7f99fd348493e60279680 Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt Date: Thu, 2 Apr 2020 12:54:46 -0700 Subject: [PATCH 4/4] typo Co-Authored-By: Robert Holt --- .vsts-ci/templates/ci-general.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci/templates/ci-general.yml b/.vsts-ci/templates/ci-general.yml index 9a43cab199..df1616c08d 100644 --- a/.vsts-ci/templates/ci-general.yml +++ b/.vsts-ci/templates/ci-general.yml @@ -9,7 +9,7 @@ steps: targetType: filePath filePath: ./tools/releaseBuild/setVstsVariables.ps1 - pwsh: | - Write-Host "Clonning '$env:PSES_BRANCH' branch from '$env:PSES_FORK/PowerShellEditorServices'" + 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 Install-Module InvokeBuild -Scope CurrentUser -Force Install-Module PlatyPS -Scope CurrentUser -Force