This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5d163dd39d6179c3618dcada86d42b2b332569f3 Author: Chesnay Schepler <ches...@apache.org> AuthorDate: Fri Aug 11 10:01:06 2023 +0200 [FLINK-32834] Run all compile scripts from root directory - make it easier to work with relative paths - specifically, useful to have the scripts rely on mvnv by default (follow-up) --- tools/ci/license_check.sh | 4 +--- tools/ci/verify_bundled_optional.sh | 4 +--- tools/ci/verify_scala_suffixes.sh | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/ci/license_check.sh b/tools/ci/license_check.sh index 79c96416113..9bbcadab96a 100755 --- a/tools/ci/license_check.sh +++ b/tools/ci/license_check.sh @@ -24,9 +24,7 @@ FLINK_DEPLOYED_ROOT=$4 source "${CI_DIR}/maven-utils.sh" -cd $CI_DIR/flink-ci-tools/ - -run_mvn exec:java -Dexec.mainClass=org.apache.flink.tools.ci.licensecheck.LicenseChecker -Dexec.args=\"$MVN_CLEAN_COMPILE_OUT $FLINK_ROOT $FLINK_DEPLOYED_ROOT\" +run_mvn -pl tools/ci/flink-ci-tools exec:java -Dexec.mainClass=org.apache.flink.tools.ci.licensecheck.LicenseChecker -Dexec.args=\"$MVN_CLEAN_COMPILE_OUT $FLINK_ROOT $FLINK_DEPLOYED_ROOT\" EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then diff --git a/tools/ci/verify_bundled_optional.sh b/tools/ci/verify_bundled_optional.sh index db43b320249..40e761ed3e6 100755 --- a/tools/ci/verify_bundled_optional.sh +++ b/tools/ci/verify_bundled_optional.sh @@ -32,9 +32,7 @@ run_mvn dependency:tree -B > "${dependency_plugin_output}" cat "${dependency_plugin_output}" -cd "${CI_DIR}/flink-ci-tools/" || exit - -run_mvn exec:java -Dexec.mainClass=org.apache.flink.tools.ci.optional.ShadeOptionalChecker -Dexec.args=\""${MVN_CLEAN_COMPILE_OUT}" "${dependency_plugin_output}"\" +run_mvn -pl tools/ci/flink-ci-tools exec:java -Dexec.mainClass=org.apache.flink.tools.ci.optional.ShadeOptionalChecker -Dexec.args=\""${MVN_CLEAN_COMPILE_OUT}" "${dependency_plugin_output}"\" EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then diff --git a/tools/ci/verify_scala_suffixes.sh b/tools/ci/verify_scala_suffixes.sh index 53b9edaf08e..756a7503bee 100755 --- a/tools/ci/verify_scala_suffixes.sh +++ b/tools/ci/verify_scala_suffixes.sh @@ -61,9 +61,7 @@ if [ $EXIT_CODE != 0 ]; then exit 1 fi -cd "${CI_DIR}/flink-ci-tools/" || exit - -run_mvn exec:java -Dexec.mainClass=org.apache.flink.tools.ci.suffixcheck.ScalaSuffixChecker -Dexec.args=\""${dependency_plugin_output}" "${FLINK_ROOT}"\" +run_mvn -pl tools/ci/flink-ci-tools exec:java exec:java -Dexec.mainClass=org.apache.flink.tools.ci.suffixcheck.ScalaSuffixChecker -Dexec.args=\""${dependency_plugin_output}" "${FLINK_ROOT}"\" EXIT_CODE=$? if [ $EXIT_CODE == 0 ]; then