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

docker: take -dev version suffix into account #2937

Merged
merged 2 commits into from
Jul 3, 2016

Conversation

ghost
Copy link

@ghost ghost commented Jul 2, 2016

The other commit makes sharness tests work with my symlinked-into-gopath setup.

@ghost ghost added kind/bug A bug in existing code (including security flaws) kind/test Testing work topic/containers + vms labels Jul 2, 2016
@ghost
Copy link
Author

ghost commented Jul 2, 2016

This fix is pretty important because it's making master green again!!11

@Kubuxu
Copy link
Member

Kubuxu commented Jul 2, 2016

Could we just grep the version string with expected hash instead? This way if we choose other suffix (rc for example) it won't break again.

@ghost
Copy link
Author

ghost commented Jul 2, 2016

Something like sed -e s/(-\w)?//?

@Kubuxu
Copy link
Member

Kubuxu commented Jul 2, 2016

You could use ipfs version --enc json and parse the commit using sed:

{"Version":"0.4.3-dev","Commit":"4fa85cc","Repo":"4","System":"amd64/linux","Golang":"go1.6.2"}

or ipfs version --commit | sed -e 's/.*-//'

@ghost ghost force-pushed the feature/docker-dev-suffix branch from f8eb025 to b639005 Compare July 2, 2016 23:43
Lars Gierth added 2 commits July 3, 2016 01:45
The double and single quotes got too damn complicated, so heredoc we go!

License: MIT
Signed-off-by: Lars Gierth <[email protected]>
License: MIT
Signed-off-by: Lars Gierth <[email protected]>
@ghost ghost force-pushed the feature/docker-dev-suffix branch from b639005 to afda38f Compare July 2, 2016 23:45
@ghost
Copy link
Author

ghost commented Jul 2, 2016

Updated it to parse from ipfs version --enc json, the quotes got waay complicated so heredoc we go :)

@whyrusleeping
Copy link
Member

bashy bashy bashy bash. LGTM

@whyrusleeping whyrusleeping merged commit 50a7df6 into master Jul 3, 2016
@whyrusleeping whyrusleeping deleted the feature/docker-dev-suffix branch July 3, 2016 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug A bug in existing code (including security flaws) kind/test Testing work topic/containers + vms
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants