Skip to content

Don't merge with upstream/master on CircleCi due to CodeCov issues #5198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wilzbach wants to merge 1 commit into from
Closed

Don't merge with upstream/master on CircleCi due to CodeCov issues #5198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions circleci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ setup_repos()
git fetch upstream
git checkout -f upstream/$base_branch
git merge -m "Automatic merge" $current_branch
# CodeCov doesn't handle a changed parent_ref well.
# It will assume all merged changes as part of this commit.
# Hence we temporarily revert the merge for .d files (we keep the updated configs)
# https://github.com/codecov/support/issues/360
git checkout $current_branch etc std
fi

for proj in dmd druntime ; do
Expand Down