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

[#173] Migrate cql-antlr from its own repo to a submodule #174

Merged
merged 2 commits into from
Oct 11, 2016
Merged

[#173] Migrate cql-antlr from its own repo to a submodule #174

merged 2 commits into from
Oct 11, 2016

Conversation

tolbertam
Copy link
Contributor

From scassandra/cql-antlr#3 we discussed moving cql-antlr in as a submodule to make it easier to coordinate changes in scassandra that require changes to cql-antlr.

This works good, but currently there is something I need to fix in the gradle-build for cql-antlr. It builds properly, but the travis build fails because successive runs don't properly skip the antlr4 task that was previously run because i currently have it set up to generate license headers in the generated files. This is so the license checker doesn't fail. I could disable generating license headers for generated code, but then the license checker fails because excludes option in the checker doesn't work for generated code (since it evaluates which code to exclude first). Anyways..I plan on finding a strategy for that tomorrow. This is only a problem for the travis build because it builds with java 8, then runs tests with java 6.

This does not include the changes for scassandra/cql-antlr#3, I will incorporate those in #171 after this pr is merged.

I also was able to import the commit history from cql-antlr repo into this one. I didn't even know that was possible, neat!

@tolbertam
Copy link
Contributor Author

The shared history thing doesn't appear to do much good since it still attributes the entire history of the file to me, sure the commits are there, but there isn't anything too substantial in the history to justify bringing it over I think, so I may get rid of it to keep the commit history clean.

@tolbertam
Copy link
Contributor Author

Hard to believe 24 days has passed since I last looked at this. Working on finishing this up today. I cleaned up the history. Instead of migrating the commit history from the original repository to this one, I simply copied the repository in as is and attributed @chbatey as the committer. Then followed on with the extra two commits to fully integrate into this repository.

@tolbertam
Copy link
Contributor Author

Alright, looks like I got it all sorted out (finally figured out how to exclude generated files from the license checker). This should be good to go!

@tolbertam tolbertam changed the title [wip] Migrate cql-antlr from its own repo to a submodule Migrate cql-antlr from its own repo to a submodule Oct 9, 2016
chbatey and others added 2 commits October 9, 2016 09:35
@tolbertam tolbertam changed the title Migrate cql-antlr from its own repo to a submodule [#173] Migrate cql-antlr from its own repo to a submodule Oct 9, 2016
@chbatey
Copy link
Member

chbatey commented Oct 11, 2016

took me a while to clock you'd preserved the history!

@chbatey chbatey merged commit dba6d5a into scassandra:master Oct 11, 2016
@tolbertam
Copy link
Contributor Author

Thanks for reviewing and merging :) 👍

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