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

lightweight tags are found in git describe #921

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

muschellij2
Copy link
Contributor

This should now look for lightweight tags and also annotated tags, not just annotated tags. This was causing the issue

ANTsX/ANTsRCore#15

This is a dirty hack to fix that issue, as the git repo is pointing to ANTsRCore and not ANTs itself, which it should be.
Related:
rpavlik/cmake-modules#35

Therefore, one tag in the last 50 (as Travis does a git clone with --depth=50) has to have the form of vN.N.N or something of the like for this to work (always starting with v). Currently, this only works when the tag is an annotated tag. This fix will work for all tags.

@cookpa
Copy link
Member

cookpa commented Dec 6, 2019

Restarting the failed Travis builds

@muschellij2
Copy link
Contributor Author

ANy thoughts on this?

@gdevenyi
Copy link
Contributor

I'm not quite sure what this addresses in terms of how the error arises yet. Do we have a complete view?

Re: Travis failing, I've made some improvements since, can you rebase on master so we can build again?

@muschellij2
Copy link
Contributor Author

The issue occurs is others trying to build but not on the ANTsX username, see ANTsX/ANTsRCore#15 for an example. The way the checks are done for the tag is that it looks for an annotated tag (or any tag with my fix), which is constrained to the last 50 commits as --depth=50 is done on Travis and other systems. Using any tag (not annotated) fixes this.

@gdevenyi
Copy link
Contributor

Ah, I didn't realize there was another solution to the shallow clone. I fixed that a while ago here via https://github.com/ANTsX/ANTs/blob/master/.travis.yml#L10-L11.

If this produces the same results in all cases but avoids the bug, I'm fine with it.

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