Skip to content

Commit 8b33c4e

Browse files
jeromy-cannonjeromy-cannon
committed
run autogen tool
Signed-off-by: Jeromy Cannon <[email protected]>
1 parent 273900d commit 8b33c4e

7 files changed

+67
-96
lines changed

‎.github/workflows/flow-build-application.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
with:
6565
custom-job-label: Standard
6666

67-
e2e-tests:
67+
e2e-standard-tests:
6868
name: E2E Tests
6969
if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
7070
uses: ./.github/workflows/zxc-e2e-test.yaml
@@ -73,9 +73,9 @@ jobs:
7373
- code-style
7474
with:
7575
custom-job-label: Standard
76-
npm-test-script: test-${{ needs.env-vars.outputs.e2e-test-subdir }}
77-
coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-test-subdir }}
78-
coverage-report-name: ${{ needs.env-vars.outputs.e2e-coverage-report }}
76+
npm-test-script: test-${{ needs.env-vars.outputs.e2e-standard-test-subdir }}
77+
coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-standard-test-subdir }}
78+
coverage-report-name: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
7979

8080
e2e-mirror-node-tests:
8181
name: E2E Tests
@@ -118,6 +118,7 @@ jobs:
118118

119119
e2e-node-local-build-tests:
120120
name: E2E Tests
121+
if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
121122
uses: ./.github/workflows/zxc-e2e-test.yaml
122123
needs:
123124
- env-vars
@@ -130,6 +131,7 @@ jobs:
130131

131132
e2e-node-add-tests:
132133
name: E2E Tests
134+
if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
133135
uses: ./.github/workflows/zxc-e2e-test.yaml
134136
needs:
135137
- env-vars
@@ -142,6 +144,7 @@ jobs:
142144

143145
e2e-node-update-tests:
144146
name: E2E Tests
147+
if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
145148
uses: ./.github/workflows/zxc-e2e-test.yaml
146149
needs:
147150
- env-vars
@@ -154,6 +157,7 @@ jobs:
154157

155158
e2e-node-delete-tests:
156159
name: E2E Tests
160+
if: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
157161
uses: ./.github/workflows/zxc-e2e-test.yaml
158162
needs:
159163
- env-vars
@@ -183,7 +187,7 @@ jobs:
183187
needs:
184188
- env-vars
185189
- unit-tests
186-
- e2e-tests
190+
- e2e-standard-tests
187191
- e2e-mirror-node-tests
188192
- e2e-node-pem-stop-tests
189193
- e2e-node-pem-kill-tests
@@ -199,7 +203,7 @@ jobs:
199203
enable-codecov-analysis: true
200204
enable-codacy-coverage: true
201205
enable-e2e-coverage-report: ${{ github.event_name == 'push' || github.event.inputs.enable-e2e-tests == 'true' }}
202-
e2e-test-subdir: ${{ needs.env-vars.outputs.e2e-test-subdir }}
206+
e2e-standard-test-subdir: ${{ needs.env-vars.outputs.e2e-standard-test-subdir }}
203207
e2e-mirror-node-test-subdir: ${{ needs.env-vars.outputs.e2e-mirror-node-test-subdir }}
204208
e2e-node-pem-stop-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}
205209
e2e-node-pem-kill-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}
@@ -208,7 +212,7 @@ jobs:
208212
e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
209213
e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
210214
e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
211-
e2e-coverage-report: ${{ needs.env-vars.outputs.e2e-coverage-report }}
215+
e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
212216
e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
213217
e2e-node-pem-stop-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}
214218
e2e-node-pem-kill-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-coverage-report }}

‎.github/workflows/flow-pull-request-checks.yaml

Lines changed: 17 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,18 @@ jobs:
5252
with:
5353
custom-job-label: Standard
5454

55-
e2e-tests:
55+
e2e-standard-tests:
5656
name: E2E Tests
57+
if: ${{ !cancelled() && always() }}
5758
uses: ./.github/workflows/zxc-e2e-test.yaml
5859
needs:
5960
- env-vars
6061
- code-style
6162
with:
6263
custom-job-label: Standard
63-
npm-test-script: test-${{ needs.env-vars.outputs.e2e-test-subdir }}
64-
coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-test-subdir }}
65-
coverage-report-name: ${{ needs.env-vars.outputs.e2e-coverage-report }}
64+
npm-test-script: test-${{ needs.env-vars.outputs.e2e-standard-test-subdir }}
65+
coverage-subdirectory: ${{ needs.env-vars.outputs.e2e-standard-test-subdir }}
66+
coverage-report-name: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
6667

6768
e2e-mirror-node-tests:
6869
name: E2E Tests
@@ -79,6 +80,7 @@ jobs:
7980

8081
e2e-node-pem-stop-tests:
8182
name: E2E Tests
83+
if: ${{ !cancelled() && always() }}
8284
uses: ./.github/workflows/zxc-e2e-test.yaml
8385
needs:
8486
- env-vars
@@ -91,6 +93,7 @@ jobs:
9193

9294
e2e-node-pem-kill-tests:
9395
name: E2E Tests
96+
if: ${{ !cancelled() && always() }}
9497
uses: ./.github/workflows/zxc-e2e-test.yaml
9598
needs:
9699
- env-vars
@@ -103,6 +106,7 @@ jobs:
103106

104107
e2e-node-local-build-tests:
105108
name: E2E Tests
109+
if: ${{ !cancelled() && always() }}
106110
uses: ./.github/workflows/zxc-e2e-test.yaml
107111
needs:
108112
- env-vars
@@ -115,6 +119,7 @@ jobs:
115119

116120
e2e-node-add-tests:
117121
name: E2E Tests
122+
if: ${{ !cancelled() && always() }}
118123
uses: ./.github/workflows/zxc-e2e-test.yaml
119124
needs:
120125
- env-vars
@@ -127,6 +132,7 @@ jobs:
127132

128133
e2e-node-update-tests:
129134
name: E2E Tests
135+
if: ${{ !cancelled() && always() }}
130136
uses: ./.github/workflows/zxc-e2e-test.yaml
131137
needs:
132138
- env-vars
@@ -139,6 +145,7 @@ jobs:
139145

140146
e2e-node-delete-tests:
141147
name: E2E Tests
148+
if: ${{ !cancelled() && always() }}
142149
uses: ./.github/workflows/zxc-e2e-test.yaml
143150
needs:
144151
- env-vars
@@ -168,7 +175,7 @@ jobs:
168175
needs:
169176
- env-vars
170177
- unit-tests
171-
- e2e-tests
178+
- e2e-standard-tests
172179
- e2e-mirror-node-tests
173180
- e2e-node-pem-stop-tests
174181
- e2e-node-pem-kill-tests
@@ -182,7 +189,7 @@ jobs:
182189
custom-job-label: Standard
183190
enable-codecov-analysis: true
184191
enable-e2e-coverage-report: true
185-
e2e-test-subdir: ${{ needs.env-vars.outputs.e2e-test-subdir }}
192+
e2e-standard-test-subdir: ${{ needs.env-vars.outputs.e2e-standard-test-subdir }}
186193
e2e-mirror-node-test-subdir: ${{ needs.env-vars.outputs.e2e-mirror-node-test-subdir }}
187194
e2e-node-pem-stop-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}
188195
e2e-node-pem-kill-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}
@@ -191,7 +198,7 @@ jobs:
191198
e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
192199
e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
193200
e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
194-
e2e-coverage-report: ${{ needs.env-vars.outputs.e2e-coverage-report }}
201+
e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
195202
e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
196203
e2e-node-pem-stop-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}
197204
e2e-node-pem-kill-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-coverage-report }}
@@ -209,7 +216,7 @@ jobs:
209216
needs:
210217
- env-vars
211218
- unit-tests
212-
- e2e-tests
219+
- e2e-standard-tests
213220
- e2e-mirror-node-tests
214221
- e2e-node-pem-stop-tests
215222
- e2e-node-pem-kill-tests
@@ -223,7 +230,7 @@ jobs:
223230
custom-job-label: Coverage
224231
enable-codacy-coverage: true
225232
enable-e2e-coverage-report: true
226-
e2e-test-subdir: ${{ needs.env-vars.outputs.e2e-test-subdir }}
233+
e2e-standard-test-subdir: ${{ needs.env-vars.outputs.e2e-standard-test-subdir }}
227234
e2e-mirror-node-test-subdir: ${{ needs.env-vars.outputs.e2e-mirror-node-test-subdir }}
228235
e2e-node-pem-stop-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}
229236
e2e-node-pem-kill-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}
@@ -232,7 +239,7 @@ jobs:
232239
e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
233240
e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
234241
e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
235-
e2e-coverage-report: ${{ needs.env-vars.outputs.e2e-coverage-report }}
242+
e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
236243
e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
237244
e2e-node-pem-stop-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}
238245
e2e-node-pem-kill-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-coverage-report }}
@@ -243,43 +250,3 @@ jobs:
243250
e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
244251
secrets:
245252
codacy-project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
246-
247-
# snyk:
248-
# name: Snyk Scan
249-
# uses: ./.github/workflows/zxc-code-analysis.yaml
250-
# needs:
251-
# - env-vars
252-
# - unit-tests
253-
# - e2e-tests
254-
# - e2e-mirror-node-tests
255-
# - e2e-node-pem-stop-tests
256-
# - e2e-node-pem-kill-tests
257-
# - e2e-node-local-build-tests
258-
# - e2e-node-add-tests
259-
# - e2e-node-update-tests
260-
# - e2e-node-delete-tests
261-
# - e2e-relay-tests
262-
# if: ${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name && github.actor != 'dependabot[bot]' }}
263-
# with:
264-
# custom-job-label: Standard
265-
# enable-snyk-scan: true
266-
# e2e-test-subdir: ${{ needs.env-vars.outputs.e2e-test-subdir }}
267-
# e2e-mirror-node-test-subdir: ${{ needs.env-vars.outputs.e2e-mirror-node-test-subdir }}
268-
# e2e-node-pem-stop-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}
269-
# e2e-node-pem-kill-test-subdir: ${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}
270-
# e2e-node-local-build-test-subdir: ${{ needs.env-vars.outputs.e2e-node-local-build-test-subdir }}
271-
# e2e-node-add-test-subdir: ${{ needs.env-vars.outputs.e2e-node-add-test-subdir }}
272-
# e2e-node-update-test-subdir: ${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}
273-
# e2e-node-delete-test-subdir: ${{ needs.env-vars.outputs.e2e-node-delete-test-subdir }}
274-
# e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
275-
# e2e-coverage-report: ${{ needs.env-vars.outputs.e2e-coverage-report }}
276-
# e2e-mirror-node-coverage-report: ${{ needs.env-vars.outputs.e2e-mirror-node-coverage-report }}
277-
# e2e-node-pem-stop-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}
278-
# e2e-node-pem-kill-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-kill-coverage-report }}
279-
# e2e-node-local-build-coverage-report: ${{ needs.env-vars.outputs.e2e-node-local-build-coverage-report }}
280-
# e2e-node-add-coverage-report: ${{ needs.env-vars.outputs.e2e-node-add-coverage-report }}
281-
# e2e-node-update-coverage-report: ${{ needs.env-vars.outputs.e2e-node-update-coverage-report }}
282-
# e2e-node-delete-coverage-report: ${{ needs.env-vars.outputs.e2e-node-delete-coverage-report }}
283-
# e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
284-
# secrets:
285-
# snyk-token: ${{ secrets.SNYK_TOKEN }}

‎.github/workflows/zxc-code-analysis.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ on:
5555
type: string
5656
required: false
5757
default: "Analyze"
58-
e2e-test-subdir:
59-
description: "E2E Test Subdirectory:"
58+
e2e-standard-test-subdir:
59+
description: "E2E Standard Test Subdirectory:"
6060
type: string
6161
required: false
62-
default: "e2e"
62+
default: "e2e-standard"
6363
e2e-mirror-node-test-subdir:
6464
description: "E2E Mirror Node Test Subdirectory:"
6565
type: string
@@ -100,11 +100,11 @@ on:
100100
type: string
101101
required: false
102102
default: "e2e-relay"
103-
e2e-coverage-report:
104-
description: "E2E Coverage Report:"
103+
e2e-standard-coverage-report:
104+
description: "E2E Standard Coverage Report:"
105105
type: string
106106
required: false
107-
default: "E2E Tests Coverage Report"
107+
default: "E2E Standard Tests Coverage Report"
108108
e2e-mirror-node-coverage-report:
109109
description: "E2E Mirror Node Coverage Report:"
110110
type: string
@@ -195,12 +195,12 @@ jobs:
195195
name: Unit Test Coverage Report
196196
path: 'coverage/unit'
197197

198-
- name: Download E2E Coverage Report
198+
- name: Download E2E Standard Coverage Report
199199
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
200200
if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
201201
with:
202-
name: ${{ inputs.e2e-coverage-report }}
203-
path: 'coverage/${{ inputs.e2e-test-subdir }}'
202+
name: ${{ inputs.e2e-standard-coverage-report }}
203+
path: 'coverage/${{ inputs.e2e-standard-test-subdir }}'
204204

205205
- name: Download E2E Mirror Node Coverage Report
206206
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
@@ -223,41 +223,41 @@ jobs:
223223
name: ${{ inputs.e2e-node-pem-kill-coverage-report }}
224224
path: 'coverage/${{ inputs.e2e-node-pem-kill-test-subdir }}'
225225

226-
- name: Download E2E Relay Coverage Report
227-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
228-
if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
229-
with:
230-
name: ${{ inputs.e2e-relay-coverage-report }}
231-
path: 'coverage/${{ inputs.e2e-relay-test-subdir }}'
232-
233-
- name: Download E2E Local Build Coverage Report
226+
- name: Download E2E Node Local Build Coverage Report
234227
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
235228
if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
236229
with:
237230
name: ${{ inputs.e2e-node-local-build-coverage-report }}
238231
path: 'coverage/${{ inputs.e2e-node-local-build-test-subdir }}'
239232

240-
- name: Download E2E Add Coverage Report
233+
- name: Download E2E Node Add Coverage Report
241234
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
242235
if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
243236
with:
244237
name: ${{ inputs.e2e-node-add-coverage-report }}
245238
path: 'coverage/${{ inputs.e2e-node-add-test-subdir }}'
246239

247-
- name: Download E2E Update Coverage Report
240+
- name: Download E2E Node Update Coverage Report
248241
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
249242
if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
250243
with:
251-
name: ${{ inputs.e2e-node-udpate-coverage-report }}
252-
path: 'coverage/${{ inputs.e2e-udpate-add-test-subdir }}'
244+
name: ${{ inputs.e2e-node-update-coverage-report }}
245+
path: 'coverage/${{ inputs.e2e-node-update-test-subdir }}'
253246

254-
- name: Download E2E Delete Coverage Report
247+
- name: Download E2E Node Delete Coverage Report
255248
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
256249
if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
257250
with:
258251
name: ${{ inputs.e2e-node-delete-coverage-report }}
259252
path: 'coverage/${{ inputs.e2e-node-delete-test-subdir }}'
260253

254+
- name: Download E2E Relay Coverage Report
255+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
256+
if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
257+
with:
258+
name: ${{ inputs.e2e-relay-coverage-report }}
259+
path: 'coverage/${{ inputs.e2e-relay-test-subdir }}'
260+
261261
- name: Publish To Codecov
262262
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
263263
if: ${{ inputs.enable-codecov-analysis && !cancelled() && !failure() }}

‎.github/workflows/zxc-e2e-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ on:
3737
description: "NPM Test Run Script:"
3838
type: string
3939
required: false
40-
default: "test-e2e"
40+
default: "test-e2e-standard"
4141
coverage-subdirectory:
4242
description: "Coverage Report Subdirectory:"
4343
type: string

0 commit comments

Comments
 (0)