Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

CircleCi: merge PRs with upstream branch#1723

Merged
andralex merged 1 commit intodlang:masterfrom
wilzbach:use-merge-for-circleci
Dec 24, 2016
Merged

CircleCi: merge PRs with upstream branch#1723
andralex merged 1 commit intodlang:masterfrom
wilzbach:use-merge-for-circleci

Conversation

@wilzbach
Copy link
Contributor

Similar to dlang/phobos#4955.

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 (DAutoTest and auto-tester behave in the same way).

I added some minor updates to the script as well, e.g. always using --depth 1 caused a stupid error at Phobos when done with the tools repo.

@wilzbach wilzbach force-pushed the use-merge-for-circleci branch from 4eaf717 to 60e34b0 Compare December 23, 2016 18:08
@wilzbach
Copy link
Contributor Author

Hmm why isn't CircleCi running at all?
Can someone with merge rights check whether it's due to the settings?

https://circleci.com/gh/dlang/druntime/edit#advanced-settings

Seems to be very similar to dlang/phobos#4850 (comment)

@schveiguy
Copy link
Member

Can someone with merge rights check whether it's due to the settings?

I see the setting "Build forked pull requests" is off, I don't see a setting for "Permissive building of forked pull requests"

@wilzbach
Copy link
Contributor Author

I see the setting "Build forked pull requests" is off, I don't see a setting for "Permissive building of forked pull requests"

So then I guess enabling "Build forked pull requests" would be the solution?
However I don't know how it got disabled :O, but we definitely had it in the past (e.g. the CodeCov results are generated on CircleCi)

@schveiguy
Copy link
Member

enabling "Build forked pull requests" would be the solution

Did so. We'll see if it helps.

@wilzbach wilzbach force-pushed the use-merge-for-circleci branch from 60e34b0 to d9d8283 Compare December 23, 2016 19:42
@wilzbach
Copy link
Contributor Author

Did so. We'll see if it helps.

Yes - thanks a lot!

image

@andralex
Copy link
Member

Have no idea what I'm doing, but heck - what's the worst that could happen?

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants