Manually merge 2.10.x into 2.11.x #4186
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CI platforms do not run their jobs on the commit you push. Instead, they run it on a merge commit so that both your changes and the latest version of the target branch are taken into account. Before uploading the coverage report, CodeCov's bash uploader attempts to find the original commit hash, and succeeds on Travis and AppVeyor, but not on Github, because the method it uses does not work unless the parent commits are fetched too, which results in Github posting to CodeCov with a different hash than Travis or AppVeyor. Setting the fetch depth fixes that issue.
Fetch parent commits
A merge is viewed by Github as a push to the branch where the merge occurs, see https://github.uint.cloudmunity/t/trigger-workflow-only-on-pull-request-merge/17359/2 This means we should have coverage reports for merge commits from Github, which should result in saner numbers.
Trigger Github workflow for merges
|
@greg0ire this assumes that you finished working on the code coverage fixes in |
|
Let me just rebase #4180 |
greg0ire
reviewed
Jul 23, 2020
This time, the coverage of a couple of OCI8-related classes dropped. Supposedly this is what integration tests would cover. Looks legit. |
…tors Ignore code coverage of private constructors of static classes
greg0ire
approved these changes
Jul 23, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On top of the changes from
2.10.x, contains the removal of the handling of the obsolete performance test group.