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

Doctr tests #1

Closed
wants to merge 7 commits into from
Closed

Doctr tests #1

wants to merge 7 commits into from

Conversation

asmeurer
Copy link
Owner

@asmeurer asmeurer commented Sep 5, 2018

No description provided.

@scopatz
Copy link

scopatz commented Sep 5, 2018

Looks like it is still giving the same error, it just doesn't have the exit code:

HEAD is now at cb6a913ca... docs build
git stash pop
HEAD detached at cb6a913ca
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
	modified:   xonsh/__init__.py
	modified:   xonsh/completers/__init__.py
	modified:   xonsh/history/__init__.py
	modified:   xonsh/prompt/__init__.py
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (80af463e0789826d079a972cc04880cc086c2817)
The docs are only pushed to gh-pages from master. To allow pushing from a non-master branch, use the --no-require-master flag
This is the doctr-tests branch

@asmeurer
Copy link
Owner Author

asmeurer commented Sep 5, 2018

That's expected output. We run git stash --all before doctr checks out gh-pages and git stash pop after it is done to prevent uncommitted changes or untracked files from preventing git checkout gh-pages from working.

The error is

error: Your local changes to the following files would be overwritten by checkout:
	xonsh/__init__.py
	xonsh/completers/__init__.py
	xonsh/hi

which is the sort of error you would see if we didn't do the stash.

However, Travis has some weird stdout buffering issues that cause output to be printed out of order, so it isn't clear to me what actually produces that error. There are two git checkout commands and they both look like they succeeded. I'm fixing that at drdoctr/doctr#323 by calling flush everywhere, but I need a build that can reproduce the error to run it on.

@asmeurer
Copy link
Owner Author

asmeurer commented Sep 5, 2018

Oh, I figured it out. The checkout is coming from your own .travis.yml https://github.com/xonsh/xonsh/blob/6a8ae04dfecaa7dcd3e157a38d15b817c6118253/.travis.yml#L66. So this isn't a doctr error, it's an error that your docs modified some checked in files. Does your amalgamate access the internet? That could explain why it didn't reproduce (I couldn't reproduce the modification of checked in files locally either).

By the way, if you want to build the docs on tags, you can use the Travis tag builds. See https://drdoctr.github.io/recipes.html#deploy-docs-from-git-tags. CC @gforsyth

@asmeurer asmeurer closed this Sep 5, 2018
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