[CircleCi] updatebuild script: merge with upstream branch#4955
[CircleCi] updatebuild script: merge with upstream branch#4955andralex merged 4 commits intodlang:masterfrom
Conversation
- added merge with upstream branch, s.t. changes are always tested as they would be merged - provide default value for CIRCLE_NODE_INDEX (makes the script easier to run manually) - move setup_repos before style task, s.t. the latest style requirements are enforced - removed exclusion of failing modules for the individual module coverage tests
a91269b to
318c1c4
Compare
circleci.sh
Outdated
| # merge with upstream branch, s.t. we check with the latest changes | ||
| git remote add upstream https://github.com/dlang/phobos.git | ||
| git fetch upstream | ||
| git merge upstream/$base_branch |
There was a problem hiding this comment.
That merge is the other way round, master into PR, does that matter?
551262b to
da6678a
Compare
da6678a to
037f7b3
Compare
It shouldn't, but to be safe, I reverted the order, s.t. we now really merge the PR into the the target branch. |
|
So we currently get failures with CircleCi due to this:
-> I have added a fix to this PR and raised the priority - would be nice to get this in. Note that this touches solely the |
I just realized that for #4921 the style check fixes aren't included. In general it makes a lot of sense to merge to merge with the upstream branch, s.t. changes are always tested as they would be merged (@CyberShadow's DAutoTest behaves similarly). While I was at the file I did a few tiny improvements:
CIRCLE_NODE_INDEX(makes the script easier to runmanually)
are enforced
coverage tests (this is due to @schveiguy's & @MartinNowak's work on issue 16291. Thanks!)
CC @MartinNowak