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

added if for work from travis ci #15

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

Conversation

merlokk
Copy link
Contributor

@merlokk merlokk commented Dec 2, 2017

added to work with Proxmark/proxmark3#503

@merlokk merlokk mentioned this pull request Dec 2, 2017
@iceman1001
Copy link
Member

Is this PR in order to pull code from different repos?!? for homebrew?!?
like setting the environment var, and the "brew tap" becomes pullning another repo than proxmark3?

@merlokk
Copy link
Contributor Author

merlokk commented Dec 2, 2017

yes, it pulls from homebrew-proxmark3. I have added PR there. It needs to correct downloading code from git in travis. approve that PR too please)

@merlokk
Copy link
Contributor Author

merlokk commented Dec 2, 2017

The proxmark travis file (brew command) pull from this repo 2 files.
I just changed to work it from regular macos and from travis

@iceman1001
Copy link
Member

well, no...
if 'brew tap proxmark' you should get the offical proxmark3.. Not pulling other repos.

@merlokk
Copy link
Contributor Author

merlokk commented Dec 2, 2017

it downloads official proxmark. but if you need download another branch or commit or repository you need to setup several environment variables.
By default it have the same behavior.

@merlokk
Copy link
Contributor Author

merlokk commented Dec 2, 2017

All the contributors dont need to change this line. Now all have their changed repository name in this file. With help of this changes you dont need to have several forks.
And regular MACs just uses this as they used it before, because they dont have variables in ENV

@merlokk
Copy link
Contributor Author

merlokk commented Dec 2, 2017

I try to do that travis can check all the commits without have special branch to checks. it not so convenient(

@pwpiwi
Copy link
Contributor

pwpiwi commented Dec 7, 2017

Agree with @iceman1001.

And I don't see the necessity to care about travis in the master repository at all. Travis tests should have been passed before commits are pushed to master. Therefore there is no point in configuring it here.

@merlokk
Copy link
Contributor Author

merlokk commented Dec 7, 2017

It not needs to config travis here. let this file just lay here)

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