CCM-17830: Make coverage report merging a makefile command

Author: gareth-allan

.github/workflows/build.yml

@@ -58,10 +58,7 @@ jobs:
           cd sandbox
           npm run test
           cd -
-          mkdir coverage coverage-temp
-          TMPDIR="./coverage-temp" npx lcov-result-merger sandbox/coverage/lcov.info coverage/lcov.info --prepend-source-files
-          rm -r coverage-temp
-          rm -rf sandbox/coverage/tmp
+          make merge-coverage-reports
 
       - name: Check licenses
         run: make check-licenses

Makefile

@@ -24,6 +24,12 @@ install-hooks: .git/hooks/pre-commit
 lint: .check-licenses .ensure-test-documentation-validity .lint-js .lint-python
 	npm run lint
 
+merge-coverage-reports:
+	mkdir -p coverage coverage-temp
+	TMPDIR="./coverage-temp" npm run merge-coverage-reports
+	rm -r coverage-temp
+	rm -rf sandbox/coverage/tmp
+
 static-analysis:
 	npm run static-analysis
 

package-lock.json

@@ -11,7 +11,8 @@
     "sandbox-postman-collection": "newman run postman/NhsNotify.Sandbox.postman_collection.json",
     "integration-postman-collection": "poetry run python scripts/build_postman_environment.py && newman run postman/NhsNotify.Integration.postman_collection.json -e postman/Integration.test.postman_environment.json",
     "static-analysis": "./scripts/perform-static-analysis.sh",
-    "zap-security-scan": "./scripts/run_zap.sh"
+    "zap-security-scan": "./scripts/run_zap.sh",
+    "merge-coverage-reports": "lcov-result-merger sandbox/coverage/lcov.info coverage/lcov.info --prepend-source-files"
   },
   "author": "NHS Digital",
   "license": "MIT",
@@ -41,6 +42,7 @@
     "eslint-plugin-workspaces": "^0.11.0",
     "eslint-plugin-yml": "^1.2.0",
     "handlebars": "^4.7.9",
+    "lcov-result-merger": "^6.0.0",
     "license-checker": "^25.0.1",
     "minimist": "^1.2.2",
     "newman": "^6.2.2",