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

adds .appveryor.yml #162

Merged
merged 4 commits into from
Sep 2, 2017
Merged

adds .appveryor.yml #162

merged 4 commits into from
Sep 2, 2017

Conversation

thisconnect
Copy link
Contributor

No description provided.

.appveyor.yml Outdated
@@ -0,0 +1,24 @@
environment:
matrix:
- nodejs_version: "4"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No more need for Node.js 4

@daviddias
Copy link
Member

rebase master on this branch so that CI is green

@thisconnect
Copy link
Contributor Author

Sorry I have to leave for today, should I be able to push git push origin appveyor (rebase noob)?

I did create the appveyor branch on github.com and edited the files through the web gui. For rebasing I tried

git clone https:/ipfs/js-ipfsd-ctl.git
git checkout appveyor
git rebase master
git status
On branch appveyor
Your branch and 'origin/appveyor' have diverged,
and have 7 and 4 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
git push origin appveyor # wont let me

Else I'll fork again tomorrow and create a new PR from my fork

@daviddias
Copy link
Member

@thisconnect you needed to do git rebase origin/master appveyor. That's fine, I'll just merge this, it is a config file and not code.

You will need to rebase for #155

@daviddias daviddias merged commit e9ac8b0 into master Sep 2, 2017
@daviddias daviddias deleted the appveyor branch September 2, 2017 10:40
@thisconnect
Copy link
Contributor Author

thanks!

@daviddias
Copy link
Member

Thank you for shipping this :)

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