Skip to content

Commit 651964b

Browse files
committed
Add macos test legs
1 parent 06b7116 commit 651964b

File tree

2 files changed

+57
-30
lines changed

2 files changed

+57
-30
lines changed

azure-pipelines.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,23 @@ stages:
3434
displayName: Test
3535
dependsOn: []
3636
jobs:
37-
- job: Test
38-
strategy:
39-
matrix:
40-
linux:
41-
demandsName: 1es-ubuntu-2004-open
42-
windows:
43-
demandsName: 1es-windows-2022-open
44-
pool:
45-
name: NetCore-Public
46-
demands: ImageOverride -equals $(demandsName)
47-
steps:
48-
- template: azure-pipelines/test.yml
37+
- template: azure-pipelines/test.yml
38+
parameters:
39+
jobName: Linux
40+
poolName: NetCore-Public
41+
demandsName: 1es-ubuntu-2004-open
42+
43+
- template: azure-pipelines/test.yml
44+
parameters:
45+
jobName: Windows
46+
poolName: NetCore-Public
47+
demandsName: 1es-windows-2022-open
48+
49+
- template: azure-pipelines/test.yml
50+
parameters:
51+
jobName: MacOS
52+
poolName: Azure Pipelines
53+
vmImageName: macOS-13
4954

5055
- stage: Test_OmniSharp
5156
displayName: Test OmniSharp

azure-pipelines/test.yml

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,44 @@
1-
steps:
2-
- checkout: self
3-
clean: true
4-
submodules: true
5-
fetchTags: false
6-
fetchDepth: 1
1+
parameters:
2+
- name: jobName
3+
type: string
4+
- name: poolName
5+
type: string
6+
- name: demandsName
7+
type: string
8+
default: ''
9+
- name: vmImageName
10+
type: string
11+
default: ''
712

8-
- template: prereqs.yml
13+
jobs:
14+
- job: Test_${{ parameters.jobName }}
15+
displayName: 'Test ${{ parameters.jobName }}'
16+
pool:
17+
${{ if ne(parameters.poolName, '') }}:
18+
name: ${{ parameters.poolName }}
19+
${{ if ne(parameters.demandsName, '') }}:
20+
demands: ImageOverride -equals ${{ parameters.demandsName }}
21+
${{ if ne(parameters.vmImageName, '') }}:
22+
vmImage: ${{ parameters.vmImageName }}
23+
steps:
24+
- checkout: self
25+
clean: true
26+
submodules: true
27+
fetchTags: false
28+
fetchDepth: 1
929

10-
- template: test-prereqs.yml
30+
- template: prereqs.yml
1131

12-
- script: npm run test
13-
displayName: 🧪 Run unit and integration tests
14-
env:
15-
DISPLAY: :99.0
32+
- template: test-prereqs.yml
1633

17-
- task: PublishPipelineArtifact@1
18-
condition: failed()
19-
displayName: 'Upload integration test logs'
20-
inputs:
21-
targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
22-
artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'
34+
- script: npm run test
35+
displayName: 🧪 Run unit and integration tests
36+
env:
37+
DISPLAY: :99.0
38+
39+
- task: PublishPipelineArtifact@1
40+
condition: failed()
41+
displayName: 'Upload integration test logs'
42+
inputs:
43+
targetPath: '$(Build.SourcesDirectory)/.vscode-test/user-data/logs'
44+
artifactName: 'VSCode Test Logs ($(Agent.JobName)-$(System.JobAttempt))'

0 commit comments

Comments
 (0)