Conversation
jwillemsen
commented
Mar 10, 2016
jwillemsen
commented
* lib/coderay/scanners/cpp.rb:
|
The travis failure looks independent of my changes, rake doesn't support the old ruby versions |
|
Awesome, thanks! Funny that they are still adding keywords to that language. Do you have some example code for the test suite? |
|
Yes, I can add some example code but I can't find the test for cpp, could you maybe point me to it? |
* FOLDERS:
|
They're here: https://github.com/rubychan/coderay-scanner-tests/tree/master/cpp. Instructions are here: https://github.com/rubychan/coderay/wiki/Test-Suite |
* lib/coderay/scanners/cpp.rb:
|
Done, will create a separate pull request |
|
Looks the failing check has nothing todo with my change |
|
Failing tests should be fixed on master, can you update your branch again please? |
|
Done, thanks for resolving this on master, now this is again green! |
|
Anything you need in addition from my side? |
|
Fixed merge conflict |
…t anymore by travis-ci, see https://docs.travis-ci.com/user/languages/ruby * .travis.yml:
|
Ok, travis-ci now allows again C extensions but looks RedCloth has another problem :-( |
|
Ok, allowed failure for jruby18/19 because of the RedCloth problem, now this pull request is passed on Jenkins and has no conflicts |
lib/coderay/scanners/cpp.rb
Outdated
| 'case', 'catch', 'class', 'compl', 'const_cast', | ||
| 'continue', 'default', 'delete', 'do', 'dynamic_cast', 'else', | ||
| 'enum', 'export', 'for', 'goto', 'if', 'namespace', 'new', | ||
| 'enum', 'export', 'final', 'for', 'goto', 'if', 'namespace', 'new', |
|
Sorry for the delay. I also updated the list of Rubies in the Travis config file, so master is green now. Can you merge again, please? |
* lib/coderay/scanners/cpp.rb:
* .travis.yml:
* .travis.yml:
|
Merged upstream master again into my tree, resolved merge conflicts |
|
Thank you :) |
|
Thanks for accepting them! |
2 participants
