Skip to content
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.

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

Docs output in master or gh-pages #304

Open
forki opened this issue Jun 28, 2017 · 8 comments
Open

Docs output in master or gh-pages #304

forki opened this issue Jun 28, 2017 · 8 comments

Comments

@forki
Copy link
Member

forki commented Jun 28, 2017

Recently we changed the scaffold to use a different workflow for docs output.

Earlier we committed the docs into gh-pages brach so that github would display it from there.
Now we commit the output directly to master.

I am very worried about that change since I fear this will lead to big merge conflicts in scenarios where we support multiple release branches or when different user release.

The original script avoided this because users integrated via master and gh-pages was only an automated step.

/cc @dsyme @pblasucci @isaacabraham @sergey-tihon @Krzysztof-Cieslak

@pblasucci
Copy link
Collaborator

I've not used ProjectScaffold for quite some time, so I don't have any direct feedback (yet... though personal life is taking me out of the community for a bit).

But I'll observe that I share @forki concern about excessive merge conflicts. On the other hand, I wonder if this helps make ProjectScaffold easier to use on other platforms (GitLab, VSTS, etc.)?

At any rate, I think this should be watched closely. And I'm very eager to hear what others think (or better: experiences using it).

@Krzysztof-Cieslak
Copy link
Member

I think having docs output in the main branch is terrible idea. It makes stuff harder to merge, creates gigantic diffs, makes repo harder to maintain. Also, in my view, docs output is just release artifact same as compiled .exe and usually no one commits those.

Can't say for other providers but on GitLab there is no need of committing docs output to get GitLab Pages working - GitLab Pages are using system based on integrated CI platform, and as long as docs is buildable on docker there will be no problem with getting them work.

@forki
Copy link
Member Author

forki commented Jul 8, 2017 via email

@gusty
Copy link
Member

gusty commented Oct 21, 2017

I think we should rollback, but it might be because I still don't understand what is the equivalent of build ReleaseDocs now.

What about letting the user choose which model to use by asking him in the first run?

@jackfoxy
Copy link
Collaborator

@jackfoxy
Copy link
Collaborator

Happy to accept a PR that give user choice at initial build.

@jackfoxy
Copy link
Collaborator

more background in this issue #201 which I am closing in favor of keeping the discussion open here

@jackfoxy
Copy link
Collaborator

jackfoxy commented Jun 9, 2018

changing name of issue and labeling help wanted
accepting PR to make configurable at init time

@jackfoxy jackfoxy changed the title Discussion: Docs output in master? Docs output in master or gh-pages Jun 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

5 participants