|
39 | 39 | pr_branch: ${{ github.event.pull_request.head.ref }}
|
40 | 40 | run: |
|
41 | 41 | if [ ! -z "${{ env.METRICS_SERVICE_SECRET }}" ]; then
|
42 |
| - ./scripts/code_coverage_report/get_updated_files.sh |
| 42 | + ./scripts/code_coverage_report/get_updated_files.sh |
43 | 43 | fi
|
44 | 44 |
|
45 | 45 | pod-lib-lint-abtesting:
|
@@ -282,13 +282,12 @@ jobs:
|
282 | 282 | - name: Compare Diff and Post a Report
|
283 | 283 | if: github.event.pull_request.merged != true && github.event.action != 'closed' && env.METRICS_SERVICE_SECRET != ''
|
284 | 284 | env:
|
285 |
| - base_commit: ${{ needs.check.outputs.base_commit }} |
| 285 | + base_commit: ${{ ${{ github.event.pull_request.base.sha }} }} |
286 | 286 | run: |
|
287 | 287 | # Get Head commit of the branch, instead of a merge commit created by actions/checkout.
|
288 |
| - GITHUB_SHA=$(cat $GITHUB_EVENT_PATH | jq -r .pull_request.head.sha) |
289 | 288 | if [ -d "${{steps.download.outputs.download-path}}" ]; then
|
290 |
| - cd scripts/code_coverage_report/generate_code_coverage_report |
291 |
| - swift run CoverageReportGenerator --presubmit "firebase/firebase-ios-sdk" --head-commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "/Users/runner/test/codecoverage" --log-link "https://github.com/firebase/firebase-ios-sdk/actions/runs/${GITHUB_RUN_ID}" --pull-request-num ${{github.event.pull_request.number}} --base-commit "$base_commit" |
| 289 | + cd scripts/code_coverage_report/generate_code_coverage_report |
| 290 | + swift run CoverageReportGenerator --presubmit "firebase/firebase-ios-sdk" --head-commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "/Users/runner/test/codecoverage" --log-link "https://github.com/firebase/firebase-ios-sdk/actions/runs/${GITHUB_RUN_ID}" --pull-request-num ${{github.event.pull_request.number}} --base-commit "$base_commit" |
292 | 291 | fi
|
293 | 292 | - name: Incremental Code Coverage
|
294 | 293 | if: github.event.pull_request.merged != true && github.event.action != 'closed'
|
@@ -319,6 +318,6 @@ jobs:
|
319 | 318 | if: github.event.pull_request.merged && env.METRICS_SERVICE_SECRET != ''
|
320 | 319 | run: |
|
321 | 320 | if [ -d "${{steps.download.outputs.download-path}}" ]; then
|
322 |
| - cd scripts/code_coverage_report/generate_code_coverage_report |
323 |
| - swift run CoverageReportGenerator --merge "firebase/firebase-ios-sdk" --head-commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "/Users/runner/test/codecoverage" --log-link "https://github.com/firebase/firebase-ios-sdk/actions/runs/${GITHUB_RUN_ID}" --source-branch "${{ github.base_ref }}" |
| 321 | + cd scripts/code_coverage_report/generate_code_coverage_report |
| 322 | + swift run CoverageReportGenerator --merge "firebase/firebase-ios-sdk" --head-commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "/Users/runner/test/codecoverage" --log-link "https://github.com/firebase/firebase-ios-sdk/actions/runs/${GITHUB_RUN_ID}" --source-branch "${{ github.base_ref }}" |
324 | 323 | fi
|
0 commit comments