tillrohrmann commented on a change in pull request #9651: [FLINK-14009][build]
Ignore license file check for Scala version different than 2.11
URL: https://github.com/apache/flink/pull/9651#discussion_r322327414
##########
File path: tools/travis_controller.sh
##########
@@ -127,25 +127,31 @@ if [ $STAGE == "$STAGE_COMPILE" ]; then
fi
if [ $EXIT_CODE == 0 ]; then
- ./tools/releasing/collect_license_files.sh ./build-target
- diff "NOTICE-binary" "licenses-output/NOTICE-binary"
- EXIT_CODE=$(($EXIT_CODE+$?))
- diff -r "licenses-binary" "licenses-output/licenses-binary"
- EXIT_CODE=$(($EXIT_CODE+$?))
-
- if [ $EXIT_CODE != 0 ]; then
- echo
"=============================================================================="
- echo "ERROR: binary licensing is out-of-date."
- echo "Please update NOTICE-binary and licenses-binary:"
- echo "Step 1: Rebuild flink"
- echo "Step 2: Run 'tools/releasing/collect_license_files.sh
build-target'"
- echo " This extracts all the licensing files from the distribution,
and puts them in 'licenses-output'."
- echo " If the build-target symlink does not exist after building
flink, point the tool to
'flink-dist/target/flink-<version>-bin/flink-<version>' instead."
- echo "Step 3: Replace existing licensing"
- echo " Delete NOTICE-binary and the entire licenses-binary
directory."
- echo " Copy the contents in 'licenses-output' into the root
directory of the Flink project."
- echo "Step 4: Remember to commit the changes!"
+ if [[ $PROFILE == *"scala-2.11"* ]]; then
+ ./tools/releasing/collect_license_files.sh ./build-target
+ diff "NOTICE-binary" "licenses-output/NOTICE-binary"
+ EXIT_CODE=$(($EXIT_CODE+$?))
+ diff -r "licenses-binary" "licenses-output/licenses-binary"
+ EXIT_CODE=$(($EXIT_CODE+$?))
+
+ if [ $EXIT_CODE != 0 ]; then
+ echo
"=============================================================================="
+ echo "ERROR: binary licensing is out-of-date."
+ echo "Please update NOTICE-binary and licenses-binary:"
+ echo "Step 1: Rebuild flink"
+ echo "Step 2: Run 'tools/releasing/collect_license_files.sh
build-target'"
+ echo " This extracts all the licensing files from the
distribution, and puts them in 'licenses-output'."
+ echo " If the build-target symlink does not exist after building
flink, point the tool to
'flink-dist/target/flink-<version>-bin/flink-<version>' instead."
+ echo "Step 3: Replace existing licensing"
+ echo " Delete NOTICE-binary and the entire licenses-binary
directory."
+ echo " Copy the contents in 'licenses-output' into the root
directory of the Flink project."
+ echo "Step 4: Remember to commit the changes!"
+ echo
"=============================================================================="
+ fi
+ else
echo
"=============================================================================="
+ echo "Ignoring the license file check because built uses different
Scala version than 2.11. See FLINK-14008."
+ echo
"=============================================================================="
Review comment:
good point. Will fix it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
