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

Fix bug that causes non-master builds to erase master docs #256

Merged
merged 4 commits into from
May 13, 2019

Conversation

jaeddy
Copy link
Member

@jaeddy jaeddy commented Apr 28, 2019

I think @natanlao's set up for the docs build in #211 might ultimately be nicer, but has gotten behind and would require some merge conflict resolution. This fix to the fetchpages script should work for now (still need to merge with develop and then master for changes to take full effect).

I also tweaked the Travis config to preserve history on the gh-pages branch, per discussion with @briandoconnor and @dglazer this morning.

@jaeddy jaeddy changed the base branch from master to develop April 28, 2019 16:54
@jaeddy jaeddy requested a review from dglazer April 30, 2019 15:06
Copy link
Member

@dglazer dglazer left a comment

Choose a reason for hiding this comment

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

LGTM, assuming it works. (fetchpages is now much simpler -- looks like the previous version was way over-complicating things.)

Copy link
Contributor

@briandoconnor briandoconnor left a comment

Choose a reason for hiding this comment

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

LGTM as well... I'll merge it into develop

@briandoconnor briandoconnor merged commit 3254b57 into develop May 13, 2019
@briandoconnor briandoconnor deleted the feature/issue-203-fix-master-docs branch May 13, 2019 14:09
jaeddy added a commit that referenced this pull request Jun 3, 2019
* modify 'fetchpages' script to preserve everything on current gh-pages

* update travis config to keep old docs

* clean up folders that aren't needed after gh-pages deploy

* fix bash typo in stagepages script
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants