Skip to content

Commit a362d48

Browse files
PaebbelsPaebbels
committed
Reduced number of parameters by passing JSON objects.
1 parent e2e8b39 commit a362d48

File tree

4 files changed

+191
-236
lines changed

4 files changed

+191
-236
lines changed

‎.github/workflows/CompletePipeline.yml‎

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@ jobs:
130130

131131
ConfigParams:
132132
uses: pyTooling/Actions/.github/workflows/ExtractConfiguration.yml@dev
133-
with:
134-
package_namespace: ${{ inputs.package_namespace }}
135-
package_name: ${{ inputs.package_name }}
136133

137134
UnitTestingParams:
138135
uses: pyTooling/Actions/.github/workflows/Parameters.yml@dev
@@ -177,42 +174,37 @@ jobs:
177174
- UnitTestingParams
178175
with:
179176
jobs: ${{ needs.UnitTestingParams.outputs.python_jobs }}
177+
# TODO: shouldn't this be configured by a parameter? Same as directories
180178
requirements: "-r tests/unit/requirements.txt"
181179
# pacboy: "msys/git python-lxml:p"
182-
unittest_report_xml_directory: ${{ needs.ConfigParams.outputs.unittest_report_xml_directory }}
183-
unittest_report_xml_filename: ${{ needs.ConfigParams.outputs.unittest_report_xml_filename }}
184-
coverage_report_xml_directory: ${{ needs.ConfigParams.outputs.coverage_report_xml_directory }}
185-
coverage_report_xml_filename: ${{ needs.ConfigParams.outputs.coverage_report_xml_filename }}
186-
coverage_report_json_directory: ${{ needs.ConfigParams.outputs.coverage_report_json_directory }}
187-
coverage_report_json_filename: ${{ needs.ConfigParams.outputs.coverage_report_json_filename }}
188-
coverage_report_html_directory: ${{ needs.ConfigParams.outputs.coverage_report_html_directory }}
189-
unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}
190-
coverage_sqlite_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }}
180+
unittest_report_xml: ${{ needs.ConfigParams.outputs.unittest_report_xml }}
181+
coverage_report_xml: ${{ needs.ConfigParams.outputs.coverage_report_xml }}
182+
coverage_report_json: ${{ needs.ConfigParams.outputs.coverage_report_json }}
183+
coverage_report_html: ${{ needs.ConfigParams.outputs.coverage_report_html }}
184+
unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}
185+
coverage_sqlite_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }}
191186

192187
StaticTypeCheck:
193188
uses: pyTooling/Actions/.github/workflows/StaticTypeCheck.yml@dev
194189
needs:
195190
- ConfigParams
196191
- UnitTestingParams
197192
with:
198-
python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
199-
junit_report_directory: ${{ needs.ConfigParams.outputs.typing_report_junit_directory }}
200-
junit_report_file: ${{ needs.ConfigParams.outputs.typing_report_junit_file }}
201-
junit_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).statictyping_junit }}
202-
cobertura_report_directory: ${{ needs.ConfigParams.outputs.typing_report_cobertura_directory }}
203-
cobertura_report_file: ${{ needs.ConfigParams.outputs.typing_report_cobertura_file }}
204-
cobertura_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).statictyping_cobertura }}
205-
html_report: ${{ needs.ConfigParams.outputs.typing_report_html_directory }}
206-
html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).statictyping_html }}
193+
python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
194+
cobertura_report: ${{ needs.ConfigParams.outputs.typing_report_cobertura }}
195+
junit_report: ${{ needs.ConfigParams.outputs.typing_report_junit }}
196+
html_report: ${{ needs.ConfigParams.outputs.typing_report_html }}
197+
cobertura_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).statictyping_cobertura }}
198+
junit_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).statictyping_junit }}
199+
html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).statictyping_html }}
207200

208201
DocCoverage:
209202
uses: pyTooling/Actions/.github/workflows/CheckDocumentation.yml@dev
210203
needs:
211-
- ConfigParams
212204
- UnitTestingParams
213205
with:
214206
python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
215-
directory: ${{ needs.ConfigParams.outputs.package_directory }}
207+
directory: ${{ needs.UnitTestingParams.outputs.package_directory }}
216208

217209
Package:
218210
uses: pyTooling/Actions/.github/workflows/Package.yml@dev
@@ -226,14 +218,13 @@ jobs:
226218
Install:
227219
uses: pyTooling/Actions/.github/workflows/InstallPackage.yml@dev
228220
needs:
229-
- ConfigParams
230221
- UnitTestingParams
231222
- InstallParams
232223
- Package
233224
with:
234225
jobs: ${{ needs.InstallParams.outputs.python_jobs }}
235226
wheel: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).package_all }}
236-
package_name: ${{ needs.ConfigParams.outputs.package_fullname }}
227+
package_name: ${{ needs.UnitTestingParams.outputs.package_fullname }}
237228

238229
# AppTesting:
239230
# uses: pyTooling/Actions/.github/workflows/ApplicationTesting.yml@dev
@@ -258,13 +249,12 @@ jobs:
258249
# coverage_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_xml }}
259250
# coverage_report_xml_directory: ${{ needs.ConfigParams.outputs.coverage_report_xml_directory }}
260251
# coverage_report_xml_filename: ${{ needs.ConfigParams.outputs.coverage_report_xml_filename }}
261-
coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }}
262-
coverage_report_json_directory: ${{ needs.ConfigParams.outputs.coverage_report_json_directory }}
263-
coverage_report_json_filename: ${{ needs.ConfigParams.outputs.coverage_report_json_filename }}
264-
coverage_html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_html }}
265-
coverage_report_html_directory: ${{ needs.ConfigParams.outputs.coverage_report_html_directory }}
266-
codecov: ${{ inputs.codecov }}
267-
codacy: ${{ inputs.codacy }}
252+
coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }}
253+
coverage_report_json: ${{ needs.ConfigParams.outputs.coverage_report_json }}
254+
coverage_html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_html }}
255+
coverage_report_html: ${{ needs.ConfigParams.outputs.coverage_report_html }}
256+
codecov: ${{ inputs.codecov }}
257+
codacy: ${{ inputs.codacy }}
268258
secrets:
269259
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
270260
CODACY_TOKEN: ${{ secrets.CODACY_TOKEN }}
@@ -277,8 +267,8 @@ jobs:
277267
- UnitTesting
278268
if: success() || failure()
279269
with:
280-
testsuite-summary-name: ${{ needs.ConfigParams.outputs.package_fullname }}
281-
merged_junit_filename: ${{ needs.ConfigParams.outputs.unittest_merged_report_xml_filename }}
270+
testsuite-summary-name: ${{ needs.UnitTestingParams.outputs.package_fullname }}
271+
merged_junit_filename: ${{ fromJson(needs.ConfigParams.outputs.unittest_merged_report_xml).filename }}
282272
merged_junit_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}
283273
dorny: ${{ inputs.dorny }}
284274
codecov: ${{ inputs.codecov }}
@@ -303,7 +293,7 @@ jobs:
303293
if: success() || failure()
304294
with:
305295
python_version: ${{ needs.UnitTestingParams.outputs.python_version }}
306-
coverage_report_json_directory: ${{ needs.ConfigParams.outputs.coverage_report_json_directory }}
296+
coverage_report_json_directory: ${{ fromJson(needs.ConfigParams.outputs.coverage_report_json).directory }}
307297
unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }}
308298
coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }}
309299
html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_html }}
@@ -326,7 +316,7 @@ jobs:
326316
- UnitTestingParams
327317
- Documentation
328318
with:
329-
document: ${{ needs.ConfigParams.outputs.package_fullname }}
319+
document: ${{ needs.UnitTestingParams.outputs.package_fullname }}
330320
latex_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_latex }}
331321
pdf_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_pdf }}
332322
can-fail: 'true'

0 commit comments

Comments
 (0)