Skip to content

Commit 8cb5e78

Browse files
committed
A little more cleanup
Also fixes the endpoing for the PR compliance job.
1 parent df8640b commit 8cb5e78

File tree

4 files changed

+17
-38
lines changed

4 files changed

+17
-38
lines changed

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,9 @@ variables:
99
value: 'true'
1010

1111
trigger:
12-
batch: true
1312
branches:
1413
include:
1514
- master
16-
- legacy/1.x
17-
paths:
18-
exclude:
19-
- /.dependabot/*
20-
- /.poshchan/*
21-
- /.github/**/*
22-
- /.vscode/**/*
23-
- /.vsts-ci/misc-analysis.yml
24-
- /tools/**/*
25-
- .editorconfig
26-
- .gitattributes
27-
- .gitignore
28-
- /docs/**/*
29-
- /CHANGELOG.md
30-
- /CONTRIBUTING.md
31-
- /README.md
32-
- /LICENSE
33-
- /CODE_OF_CONDUCT.md
3415

3516
jobs:
3617
- job: PS51_Win2016

.vsts-ci/misc-analysis.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,22 @@
11
name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
2-
trigger:
3-
# Batch merge builds together while a merge build is running
4-
batch: true
5-
branches:
6-
include:
7-
- master
82

9-
pr:
3+
trigger:
104
branches:
115
include:
126
- master
13-
- legacy/1.x
147

158
resources:
169
repositories:
1710
- repository: ComplianceRepo
1811
type: github
19-
endpoint: ComplianceGHRepo
12+
endpoint: GitHub
2013
name: PowerShell/compliance
2114

2215
jobs:
23-
- job: Compliance_Job
16+
- job: Compliance
2417
pool:
2518
vmImage: windows-latest
2619
steps:
2720
- checkout: self
28-
clean: true
2921
- checkout: ComplianceRepo
30-
clean: true
3122
- template: ci-compliance.yml@ComplianceRepo
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
steps:
22
- checkout: self
3+
34
- checkout: vscode-powershell
5+
46
- download: current
57
artifact: PowerShellEditorServices
68
displayName: Download signed pipeline artifacts
9+
710
- pwsh: |
11+
Write-Host "Install and import PowerShell modules"
812
Set-PSRepository -Name PSGallery -InstallationPolicy Trusted | Out-Null
9-
Install-Module -Name PowerShellForGitHub -Scope CurrentUser -Force -Confirm:$false
13+
Install-Module -Name PowerShellForGitHub -Scope CurrentUser -Force
1014
Import-Module '$(Build.SourcesDirectory)/vscode-powershell/tools/ReleaseTools.psm1'
15+
16+
Write-Host "Setup authentication"
1117
Set-GitHubConfiguration -SuppressTelemetryReminder
1218
$password = ConvertTo-SecureString -String '$(GitHubToken)' -AsPlainText -Force
1319
Set-GitHubAuthentication -Credential (New-Object System.Management.Automation.PSCredential ("token", $password))
20+
21+
Write-Host "Publish draft release"
1422
New-DraftRelease -RepositoryName PowerShellEditorServices -Assets '$(Pipeline.Workspace)/PowerShellEditorServices/PowerShellEditorServices.zip'
1523
displayName: Drafting a GitHub Release

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
steps:
2-
32
- download: current
43
displayName: Download unsigned pipeline artifacts
54

@@ -52,10 +51,6 @@ steps:
5251
replaceExistingArchive: true
5352
verbose: true
5453

55-
- publish: PowerShellEditorServices.zip
56-
artifact: PowerShellEditorServices
57-
displayName: Publish signed pipeline artifacts
58-
5954
- checkout: self
6055

6156
- template: assembly-module-compliance.yml@ComplianceRepo
@@ -74,5 +69,9 @@ steps:
7469
optionsFTPath: $(Build.SourcesDirectory)/PowerShellEditorServices/tools/terms/FileTypeSet.xml
7570
# tsa-upload
7671
codeBaseName: PowerShell_PowerShellEditorServices_20210201
77-
# selections
72+
# We don't use any Windows APIs directly, so we don't need API scan
7873
APIScan: false
74+
75+
- publish: PowerShellEditorServices.zip
76+
artifact: PowerShellEditorServices
77+
displayName: Publish signed pipeline artifacts

0 commit comments

Comments
 (0)