Skip to content

Commit 726de70

Browse files
committed
Semver checks in matrix
1 parent e5bc771 commit 726de70

File tree

2 files changed

+38
-6
lines changed

2 files changed

+38
-6
lines changed

eng/pipelines/templates/jobs/ci.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,19 @@ jobs:
3232
Toolchain: stable
3333
TimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
3434

35-
- template: /eng/pipelines/templates/jobs/semver.yml
35+
36+
- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
3637
parameters:
37-
ServiceDirectory: ${{ parameters.ServiceDirectory }}
38+
JobTemplatePath: /eng/pipelines/templates/jobs/semver.yml
39+
MatrixConfigs: ${{ parameters.MatrixConfigs }}
40+
MatrixFilters: ${{ parameters.MatrixFilters }}
41+
MatrixReplace: ${{ parameters.MatrixReplace }}
42+
CloudConfig:
43+
Cloud: public
44+
SparseCheckoutPaths:
45+
- /*
46+
AdditionalParameters:
47+
ServiceDirectory: ${{ parameters.ServiceDirectory }}
3848

3949
- template: /eng/common/pipelines/templates/jobs/generate-job-matrix.yml
4050
parameters:

eng/pipelines/templates/jobs/semver.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,37 @@ parameters:
22
- name: ServiceDirectory
33
type: string
44

5+
# required matrix parameters
6+
- name: UsePlatformContainer
7+
type: boolean
8+
- name: OSName
9+
type: string
10+
- name: Matrix
11+
type: object
12+
- name: DependsOn
13+
type: string
14+
- name: CloudConfig
15+
type: object
16+
517
jobs:
6-
- job: Semver
18+
- job:
719
displayName: Semver Check
820
condition: and(succeeded(), ne(variables['Skip.Semver'], 'true'))
21+
dependsOn: ${{ parameters.DependsOn }}
22+
23+
strategy:
24+
matrix: $[ ${{ parameters.Matrix }} ]
925

1026
pool:
11-
os: linux
12-
name: $(LINUXPOOL)
13-
image: $(LINUXVMIMAGE)
27+
name: $(Pool)
28+
# 1es pipeline templates converts `image` to demands: ImageOverride under the hood
29+
# which is incompatible with image selection in the default non-1es hosted pools
30+
${{ if eq(parameters.OSName, 'macOS') }}:
31+
vmImage: $(OSVmImage)
32+
${{ else }}:
33+
image: $(OSVmImage)
34+
os: ${{ parameters.OSName }}
35+
1436

1537
steps:
1638
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml

0 commit comments

Comments
 (0)