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

[RFC] Travis: Add subdirectories to dependency paths. #1037

Merged
merged 1 commit into from Sep 12, 2014

Conversation

fwalch
Copy link
Member

@fwalch fwalch commented Aug 6, 2014

Update paths in travis.sh to work with automatic dependency builds on Travis (see neovim/bot-ci#8). The last commit is a quick fix for the problems in #1031 so that builds won't fail because of that.

Would need to be merged after neovim/bot-ci#8 is merged and a neovim/bot-ci build has been successful. Until then, this PR will not build on Travis, because the updated paths are not yet in neovim/deps.

Related: #1033.

@@ -123,7 +123,7 @@ add_subdirectory(config)
add_subdirectory(src/nvim)
add_subdirectory(test/includes)

find_program(BUSTED_PRG busted)
find_program(BUSTED_PRG busted_bootstrap)
Copy link
Member

Choose a reason for hiding this comment

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

@fwalch This won't be needed if we update busted, right?

@fwalch
Copy link
Member Author

fwalch commented Aug 29, 2014

@fwalch This won't be needed if we update busted, right?

@justinmk Yes, that's right. I updated this PR, but it's only necessary after the dependency building is in neovim/bot-ci (of course can be pulled before if folders are renamed in neovim/deps), and if changes to CMakeLists should be kept to a minimum. The alternative is updating CMakeLists to allow something like here.

@fwalch
Copy link
Member Author

fwalch commented Sep 11, 2014

Updated this PR for neovim/deps#4, see there for more explanations.

@fwalch fwalch changed the title [WIP] Automatic dependency rebuilding: Update paths in travis.sh [RFC] Automatic dependency rebuilding: Update paths in travis.sh Sep 11, 2014
@fwalch fwalch changed the title [RFC] Automatic dependency rebuilding: Update paths in travis.sh [RFC] Travis: Add subdirectories to dependency paths. Sep 11, 2014
justinmk added a commit that referenced this pull request Sep 12, 2014
Travis: Add subdirectories to dependency paths.
@justinmk justinmk merged commit 5ca1f97 into neovim:master Sep 12, 2014
@fwalch fwalch deleted the automatic-deps-paths branch September 12, 2014 14:06
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.

None yet

2 participants