Skip to content

[CircleCi] updatebuild script: merge with upstream branch#4955

Merged
andralex merged 4 commits intodlang:masterfrom
wilzbach:circleci-merge-with-upstream
Dec 23, 2016
Merged

[CircleCi] updatebuild script: merge with upstream branch#4955
andralex merged 4 commits intodlang:masterfrom
wilzbach:circleci-merge-with-upstream

Conversation

@wilzbach
Copy link
Contributor

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:

  • 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 (this is due to @schveiguy's & @MartinNowak's work on issue 16291. Thanks!)

CC @MartinNowak

- 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
@wilzbach wilzbach force-pushed the circleci-merge-with-upstream branch from a91269b to 318c1c4 Compare December 17, 2016 16:38
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That merge is the other way round, master into PR, does that matter?

@wilzbach wilzbach force-pushed the circleci-merge-with-upstream branch 4 times, most recently from 551262b to da6678a Compare December 21, 2016 17:21
@wilzbach wilzbach force-pushed the circleci-merge-with-upstream branch from da6678a to 037f7b3 Compare December 21, 2016 18:49
@wilzbach
Copy link
Contributor Author

That merge is the other way round, master into PR, does that matter?

It shouldn't, but to be safe, I reverted the order, s.t. we now really merge the PR into the the target branch.

@wilzbach
Copy link
Contributor Author

So we currently get failures with CircleCi due to this:

This has to do with the new public unittest tester: to avoid random failures a specific git version of the tools repo is checked out.
The problem is that we do a git clone with --depth 1 by default and just recently a new commit got into the tools repo, s.t. the checked out version isn't fetched anymore due.

-> 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 circle.sh files and with the status quo of CircleCi being broken, it's definitely an improvement ;-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants