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

Makes all tests pass on Windows #1939

Merged
merged 14 commits into from
Aug 13, 2017
Merged

Conversation

philipmat
Copy link
Contributor

@jpoon
Copy link
Member

jpoon commented Jul 27, 2017

  1. Can you squash your commits?
  2. I restarted Travis in hopes that it was a flukey error.

@Chillee
Copy link
Member

Chillee commented Jul 27, 2017

@jpoon It has something to do with the neovim script I think. I've been busy interning (my evaluation period is coming up!) but somebody mentioned that it could have to do with our ubuntu version?

I think the better thing to do is to switch to the neovim appImage.

@philipmat
Copy link
Contributor Author

@jpoon if you're asking me about squashing, I'd be happy to do it, but I believe GitHub already supports this through Squash and merge

@Chillee
Copy link
Member

Chillee commented Aug 9, 2017

@philipmat Could you try resolving the conflict (which should be just removing test/cmd_line/read.test.ts) and running the tests again?

@Chillee
Copy link
Member

Chillee commented Aug 10, 2017

Huh. I thought github could show you what the conflicts were.

@philipmat
Copy link
Contributor Author

AppVeyor is green as well: https://ci.appveyor.com/project/philipmat/vim/build/1.0.13

@Chillee
Copy link
Member

Chillee commented Aug 10, 2017

@philipmat Did you and @jpoon decide whether we want to re-integrate Appveyor checks?

@philipmat
Copy link
Contributor Author

philipmat commented Aug 10, 2017

@jpoon said, and I quote:

Happy to set it up again [...]

:)

Y'all would need to add a badge, though.

@Chillee
Copy link
Member

Chillee commented Aug 10, 2017

I always thought that it wasn't really necessary because it's electron, but I guess that's not really true, especially with neovim as well as all other sorts of things.

The main thing I'm concerned with Appveyor is tests being even more flaky, as well as increasing test times.

@philipmat
Copy link
Contributor Author

The tests are not mandatory, but it's good to have signals that everything works well across all platforms VSCode runs on.

If you want to ignore a broken AppVeyor build, there's nothing stoppping you.

Oh, and AppVeyor seems to finish faster than Travis so there's no waiting either 😀

@Chillee
Copy link
Member

Chillee commented Aug 10, 2017

So long as Windows test fail doesn't prevent us from pushing a release, that's good 👍

All we need now is to figure out what those conflicts are...

@philipmat
Copy link
Contributor Author

They're not preventing you because you're using the Travis build to push a release (AFAICT)

I currently see no conflicts on this branch. Should I be looking elsewhere?

@Chillee
Copy link
Member

Chillee commented Aug 12, 2017

No it's good now. Before it said that there were conflicts that needed to be resolved without showing any conflicts, so I was confused. Thanks.

@Chillee
Copy link
Member

Chillee commented Aug 13, 2017

Huh. They seem to only show on web, but not on mobile.

http://i.imgur.com/vYUz67N.jpg

@Chillee Chillee merged commit 6b70287 into VSCodeVim:master Aug 13, 2017
@Chillee
Copy link
Member

Chillee commented Aug 13, 2017

I just merged it on mobile...

This pull request was closed.
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