Skip to content

Commit 812f6cb

Browse files
committed
(build) small regrouping of the jobs in AzDo and GA
1 parent 4e3f0ec commit 812f6cb

File tree

4 files changed

+36
-22
lines changed

4 files changed

+36
-22
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
jobs:
2+
- ${{ each distro in parameters.distros }}:
3+
- ${{ each dotnetVersion in parameters.dotnetVersions }}:
4+
- job:
5+
displayName: 'Artifacts Test ${{ distro }} ${{ dotnetVersion }} (${{ parameters.name }})'
6+
pool:
7+
vmImage: ${{ parameters.vmImage }}
8+
steps:
9+
- template: common-steps.yml
10+
parameters:
11+
includeArtifacts: true
12+
- pwsh: ./build.ps1 -target Artifacts-Test -DockerDistro ${{ distro }} -DockerDotnetVersion ${{ dotnetVersion }}
13+
displayName: '[Docker Test Artifacts ${{ distro }}_${{ dotnetVersion }}]'

.azurepipelines/artifacts-test.yml renamed to .azurepipelines/artifacts-windows-test.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
11
jobs:
2-
- ${{ each distro in parameters.distros }}:
3-
- ${{ each dotnetVersion in parameters.dotnetVersions }}:
4-
- job:
5-
displayName: 'Artifacts Test ${{ distro }} ${{ dotnetVersion }} (${{ parameters.name }})'
6-
pool:
7-
vmImage: ${{ parameters.vmImage }}
8-
steps:
9-
- template: common-steps.yml
10-
parameters:
11-
includeArtifacts: true
12-
- pwsh: ./build.ps1 -target Artifacts-Test -DockerDistro ${{ distro }} -DockerDotnetVersion ${{ dotnetVersion }}
13-
displayName: '[Docker Test Artifacts ${{ distro }}_${{ dotnetVersion }}]'
142
- job: Artifacts_Test_MsBuild
153
displayName: Artifacts Test MsBuild (Windows)
164
pool:
@@ -40,4 +28,4 @@ jobs:
4028
parameters:
4129
includeArtifacts: true
4230
- pwsh: ./build.ps1 -target Artifacts-Portable-Test
43-
displayName: '[Portable Test Artifacts]'
31+
displayName: '[Portable Test Artifacts]'

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ jobs:
9696
shell: pwsh
9797
run: ./build.ps1 -target Test
9898

99-
artifact_test:
100-
name: Artifacts Test
99+
artifact_linux_test:
100+
name: Artifacts Linux Test
101101
needs: [build, test]
102102
runs-on: ubuntu-latest
103103
strategy:
@@ -225,7 +225,7 @@ jobs:
225225

226226
docker:
227227
name: Docker
228-
needs: [artifact_test, artifact_msbuild_test, artifact_commandline_test, artifact_portable_test]
228+
needs: [artifact_linux_test, artifact_msbuild_test, artifact_commandline_test, artifact_portable_test]
229229
runs-on: ubuntu-latest
230230
env:
231231
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
@@ -265,7 +265,7 @@ jobs:
265265

266266
publish:
267267
name: Publish
268-
needs: [artifact_test]
268+
needs: [artifact_linux_test]
269269
runs-on: windows-latest
270270
strategy:
271271
matrix:

azure-pipelines.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,34 @@ stages:
4848
steps:
4949
- template: .azurepipelines/test.yml
5050

51-
- stage: Artifact_Test
52-
displayName: 'Artifacts test'
51+
- stage: Artifact_Linux_Test
52+
displayName: 'Artifacts Linux test'
5353
dependsOn:
5454
- Build
5555
- Test
5656
condition: succeeded()
5757
jobs:
58-
- template: .azurepipelines/artifacts-test.yml
58+
- template: .azurepipelines/artifacts-linux-test.yml
5959
parameters:
6060
name: Linux
6161
vmImage: 'ubuntu-latest'
6262
distros: [ 'alpine.3.12-x64', 'centos.7-x64', 'debian.9-x64', 'debian.10-x64', 'fedora.32-x64', 'ubuntu.16.04-x64', 'ubuntu.18.04-x64', 'ubuntu.20.04-x64' ]
6363
dotnetVersions: [ '3.1' ]
6464

65+
- stage: Artifact_Windows_Test
66+
displayName: 'Artifacts Windows test'
67+
dependsOn:
68+
- Build
69+
- Test
70+
condition: succeeded()
71+
jobs:
72+
- template: .azurepipelines/artifacts-windows-test.yml
73+
6574
- stage: Docker
6675
displayName: 'Docker Build & Test'
67-
dependsOn: Artifact_Test
76+
dependsOn:
77+
- Artifact_Linux_Test
78+
- Artifact_Windows_Test
6879
condition: succeeded()
6980
jobs:
7081
- template: .azurepipelines/docker.yml
@@ -76,7 +87,9 @@ stages:
7687

7788
- stage: Publish
7889
displayName: 'Publish'
79-
dependsOn: Artifact_Test
90+
dependsOn:
91+
- Artifact_Linux_Test
92+
- Artifact_Windows_Test
8093
condition: succeeded()
8194
jobs:
8295
- job: Publish

0 commit comments

Comments
 (0)