codecov fails in CircleCI on merge commits

[eps1lon]

When running bash <(curl -s https://codecov.io/bash) on a PR in CircleCI that has a merge commit as the latest commit codecov will fail with

HTTP 400
Commit sha does not match Circle build.

Full report

I guess this fixable on our end if we call it with -C $CIRCLE_SHA1 or simply add empty commits after merges but I'd like to understand the reason for that behavior.

[alejandrovelez7]

Was this fixed? I see some messages along the lines of: Fixing merge commit SHA when using the bash uploader. But we still see unexpected results when codecov runs on a PR with a merge commit as it's latest commit.

[evantorrie]

Still not fixed. Is this just a CircleCI issue?

[thomasrockhu]

@evantorrie would you be able to supply a circleci build URL?

[evantorrie]

@thomasrockhu Here's an example. Check the Upload Coverage Results step.

The corresponding commit was a "merge" from master into the PR. Here's a link to the PR.

[thomasrockhu]

Thanks @evantorrie, this is going to take a bit of time to investigate properly to handle all use cases. For now, the workaround is to specify -C $CIRCLE_SHA1. I'll update here as we work through the issue.

[evantorrie]

Thanks @thomasrockhu. Regarding using -C $CIRCLE_SHA1, it's unclear to me how to do this using the Codecov CircleCI Orb, since it seems to require passing an extra parameter which is not supported in the existing Orb code.

I opened codecov/codecov-circleci-orb#48 to address this, but it doesn't appear that a reviewer has looked at that yet.

[thomasrockhu]

@eps1lon, @alejandrovelez7, @evantorrie, we recently made some changes to the bash uploader here. Would you mind taking a look to see if this is still an issue?

[eps1lon]

We're using -C $CIRCLE_SHA1 now. I don't plan on testing if this is no longer necessary since -C has been working for us.

[alejandrovelez7]

@thomasrockhu We've transitioned to Buildkite since then so can't help out sadly! We got around this at the time by squashing our PRs too if that helps.