$(CI) is not available for us, so use $(TRAVIS_BUILD_NUMBER) instead
reformat some stuff