You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2019/09/09 16:10:34 UTC
[flink] branch release-1.9 updated: [FLINK-14009][build] Ignore
license file check for Scala version different than 2.11
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.9 by this push:
new a00805e [FLINK-14009][build] Ignore license file check for Scala version different than 2.11
a00805e is described below
commit a00805eea4e20e4aff83f7de2650530af96da4bb
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Mon Sep 9 09:50:41 2019 +0200
[FLINK-14009][build] Ignore license file check for Scala version different than 2.11
This closes #9651.
---
tools/travis_controller.sh | 40 +++++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/tools/travis_controller.sh b/tools/travis_controller.sh
index afb7446..bd58a9d 100755
--- a/tools/travis_controller.sh
+++ b/tools/travis_controller.sh
@@ -127,24 +127,30 @@ 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
+ 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 "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 "Ignoring the license file check because built uses different Scala version than 2.11. See FLINK-14008."
echo "=============================================================================="
fi
else