Skip to content

Commit d6f0027

Browse files
authored
Enable builds for PRs that target master branch (#1108)
Signed-off-by: nkl199@yahoo.co.uk <nkl199@yahoo.co.uk>
1 parent bc436e8 commit d6f0027

File tree

1 file changed

+81
-76
lines changed

1 file changed

+81
-76
lines changed

azure-pipelines.yml

Lines changed: 81 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,96 @@
11
trigger:
22
- main
33

4+
pr:
5+
- master
6+
47
pool:
58
vmImage: 'ubuntu-latest'
69

7-
jobs:
8-
- job: unitTests
9-
displayName: 'Base build and unit tests'
10-
steps:
11-
- task: NodeTool@0
12-
inputs:
13-
versionSpec: '10.x'
14-
displayName: 'Install Node.js'
10+
stages:
11+
- stage: UnitTests
12+
displayName: Run unit tests
13+
jobs:
14+
- job: unitTests
15+
displayName: 'Base build and unit tests'
16+
steps:
17+
- task: NodeTool@0
18+
inputs:
19+
versionSpec: '10.x'
20+
displayName: 'Install Node.js'
1521

16-
- script: |
17-
./scripts/check-package-names.sh
18-
displayName: 'check package names'
22+
- script: |
23+
./scripts/check-package-names.sh
24+
displayName: 'check package names'
1925
20-
- script: |
21-
npm install
22-
npm run bootstrap
23-
displayName: 'npm install, bootstrap'
26+
- script: |
27+
npm install
28+
npm run bootstrap
29+
displayName: 'npm install, bootstrap'
2430
25-
- script: |
26-
./packages/caliper-publish/publish.js version check
27-
displayName: 'version check'
31+
- script: |
32+
./packages/caliper-publish/publish.js version check
33+
displayName: 'version check'
2834
29-
- script: |
30-
npm test
31-
displayName: 'unit test'
35+
- script: |
36+
npm test
37+
displayName: 'unit test'
3238
33-
- job: fabricIntegration
34-
displayName: 'Fabric Integration Test'
35-
dependsOn: unitTests
36-
variables: { BENCHMARK: fabric }
37-
steps:
38-
- task: NodeTool@0
39-
inputs:
40-
versionSpec: '10.x'
41-
displayName: 'Install Node.js'
42-
- script: |
43-
.build/benchmark-integration-test-direct.sh
39+
- stage: IntegrationTests
40+
displayName: Run integration tests
41+
dependsOn: UnitTests
42+
jobs:
43+
- job: fabricIntegration
44+
displayName: 'Fabric Integration Test'
45+
variables: { BENCHMARK: fabric }
46+
steps:
47+
- task: NodeTool@0
48+
inputs:
49+
versionSpec: '10.x'
50+
displayName: 'Install Node.js'
51+
- script: |
52+
.build/benchmark-integration-test-direct.sh
4453
45-
- job: ethereumIntegration
46-
displayName: 'Ethereum Integration Test'
47-
dependsOn: unitTests
48-
variables: { BENCHMARK: ethereum }
49-
steps:
50-
- task: NodeTool@0
51-
inputs:
52-
versionSpec: '10.x'
53-
displayName: 'Install Node.js'
54-
- script: |
55-
.build/benchmark-integration-test-direct.sh
54+
- job: ethereumIntegration
55+
displayName: 'Ethereum Integration Test'
56+
variables: { BENCHMARK: ethereum }
57+
steps:
58+
- task: NodeTool@0
59+
inputs:
60+
versionSpec: '10.x'
61+
displayName: 'Install Node.js'
62+
- script: |
63+
.build/benchmark-integration-test-direct.sh
5664
57-
- job: besuIntegration
58-
displayName: 'Besu Integration Test'
59-
dependsOn: unitTests
60-
variables: { BENCHMARK: besu }
61-
steps:
62-
- task: NodeTool@0
63-
inputs:
64-
versionSpec: '10.x'
65-
displayName: 'Install Node.js'
66-
- script: |
67-
.build/benchmark-integration-test-direct.sh
65+
- job: besuIntegration
66+
displayName: 'Besu Integration Test'
67+
variables: { BENCHMARK: besu }
68+
steps:
69+
- task: NodeTool@0
70+
inputs:
71+
versionSpec: '10.x'
72+
displayName: 'Install Node.js'
73+
- script: |
74+
.build/benchmark-integration-test-direct.sh
6875
69-
- job: fiscoIntegration
70-
displayName: 'FISCO BCOS Integration Test'
71-
dependsOn: unitTests
72-
variables: { BENCHMARK: fisco-bcos }
73-
steps:
74-
- task: NodeTool@0
75-
inputs:
76-
versionSpec: '10.x'
77-
displayName: 'Install Node.js'
78-
- script: |
79-
.build/benchmark-integration-test-direct.sh
76+
- job: fiscoIntegration
77+
displayName: 'FISCO BCOS Integration Test'
78+
variables: { BENCHMARK: fisco-bcos }
79+
steps:
80+
- task: NodeTool@0
81+
inputs:
82+
versionSpec: '10.x'
83+
displayName: 'Install Node.js'
84+
- script: |
85+
.build/benchmark-integration-test-direct.sh
8086
81-
- job: generatorIntegration
82-
displayName: 'Generator Integration Test'
83-
dependsOn: unitTests
84-
variables: { BENCHMARK: generator }
85-
steps:
86-
- task: NodeTool@0
87-
inputs:
88-
versionSpec: '10.x'
89-
displayName: 'Install Node.js'
90-
- script: |
91-
.build/benchmark-integration-test-direct.sh
87+
- job: generatorIntegration
88+
displayName: 'Generator Integration Test'
89+
variables: { BENCHMARK: generator }
90+
steps:
91+
- task: NodeTool@0
92+
inputs:
93+
versionSpec: '10.x'
94+
displayName: 'Install Node.js'
95+
- script: |
96+
.build/benchmark-integration-test-direct.sh

0 commit comments

Comments
 (0)