Skip to content

Moving gh-pages stuff to docs/ directory, with script to build and deploy to gh-pages.#157

Merged
sergeyk merged 4 commits intoBVLC:masterfrom
sergeyk:master
Feb 25, 2014
Merged

Moving gh-pages stuff to docs/ directory, with script to build and deploy to gh-pages.#157
sergeyk merged 4 commits intoBVLC:masterfrom
sergeyk:master

Conversation

@sergeyk
Copy link
Contributor

@sergeyk sergeyk commented Feb 25, 2014

This will allow easier documentation of code, as requested in #151.
The build script is kind of scary because uncommitted work in the code branch will be lost in the process of deployment. Not sure how to get around that -- right now we prompt people to understand what they're doing.

@shelhamer
Copy link
Member

For further safety, we could add a failsafe check for a dirty tree:

if [ $(git status --porcelain 2> /dev/null | wc -l) != 0 ]; then
    # checkout is dirty, bail and warn
fi

More importantly, we need to not accidentally contaminate gh-pages by accidentally committing uncommitted work in the code branch (since it will be especially confusing on returning to master and finding your uncommitted changes gone).

@sergeyk
Copy link
Contributor Author

sergeyk commented Feb 25, 2014

I think I'll have a better solution in a few minutes

@sergeyk
Copy link
Contributor Author

sergeyk commented Feb 25, 2014

This solution is better. Try it out: scripts/build_and_deploy_docs.sh

@shelhamer
Copy link
Member

The update is the right approach.

The requirement to work from master is good, because gh-pages should only track the stable master and published once changes are merged in.

One could go a step further, and makes docs/ a submodule to caffe:gh-pages but it is a step too far. While this would assure a checkout of caffe:master will always be up-to-date with the corresponding docs, it brings back the hassle of making separate commits and PRs for the project and its docs.

@sergeyk
Copy link
Contributor Author

sergeyk commented Feb 25, 2014

Sounds like a go-ahead to me!

@sergeyk sergeyk closed this Feb 25, 2014
@sergeyk sergeyk reopened this Feb 25, 2014
sergeyk added a commit that referenced this pull request Feb 25, 2014
Moving gh-pages stuff to docs/ directory, with script to build and deploy to gh-pages.
@sergeyk sergeyk merged commit 41b6b21 into BVLC:master Feb 25, 2014
@shelhamer
Copy link
Member

approbation

mitmul pushed a commit to mitmul/caffe that referenced this pull request Sep 30, 2014
Moving gh-pages stuff to docs/ directory, with script to build and deploy to gh-pages.
lukeyeager added a commit to lukeyeager/caffe that referenced this pull request Aug 17, 2016
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.

2 participants

Comments