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

PR not properly checked #92

Closed
gillesdegottex opened this issue May 9, 2018 · 8 comments
Closed

PR not properly checked #92

gillesdegottex opened this issue May 9, 2018 · 8 comments

Comments

@gillesdegottex
Copy link
Owner

gillesdegottex commented May 9, 2018

See comments in #91 and:

$ git checkout $TRAVIS_BRANCH
Warning: you are leaving 2 commits behind, not connected to
any of your branches:
  272f5e1 Merge 56f615d2389503d0e765da2f42d439bcbe350ebc into b8e3d8f7d110d5ae891576c99dd99e9610017cf1
  56f615d Convert QGLWidget usage to QOpenGLWidget
If you want to keep them by creating a new branch, this may be a good time
to do so with:
 git branch <new-branch-name> 272f5e1
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
@dsboger-zz
Copy link
Contributor

Is that explicit git checkout necessary? Should not Travis prepare the repository automatically?

@gillesdegottex
Copy link
Owner Author

Yes it should, but I had to do this for .... for a reason I can't remember now :P

@gillesdegottex
Copy link
Owner Author

I think the describe was not working properly.
Let's try without.

@gillesdegottex
Copy link
Owner Author

It went through:
https://github.com/gillesdegottex/fmit/releases/tag/v1.1.18

Do you mind checking the version that appears in the aboutbox? I wonder if that was the problem.

@gillesdegottex
Copy link
Owner Author

E.g.

Project MESSAGE: Git: FMIT version: v1.1.18 Branch: HEAD

@dsboger-zz
Copy link
Contributor

When I checkout from v1.1.18, then compile and run FMIT, the about dialog shows "Version 1.1.18-HEAD". Is that what you mean?

@gillesdegottex
Copy link
Owner Author

gillesdegottex commented May 9, 2018

yes, that was the bug this checkout was dealing with.
travis checkout the commit in a detached head (don't ask me why, I've never really understood)
now we need a fix that deals with both situations ...

and thanks for having checked.

@gillesdegottex
Copy link
Owner Author

gillesdegottex commented May 10, 2018

Result of git branch in Travis:

* (HEAD detached at abd4dfb)
   master

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

2 participants