diff --git a/eng/mgmt/automation/changelog.py b/eng/mgmt/automation/changelog.py index fd62451eae7e..72f7a5767305 100755 --- a/eng/mgmt/automation/changelog.py +++ b/eng/mgmt/automation/changelog.py @@ -9,7 +9,7 @@ from parameters import * from generate import update_parameters from generate_utils import get_version -from generate import compile_package +from generate_utils import compile_arm_package from generate import compare_with_maven_package os.chdir(pwd) @@ -31,7 +31,7 @@ def main(): update_parameters(args.get('suffix')) if args.get('compile'): - compile_package(sdk_root, service) + compile_arm_package(sdk_root, service) versions = get_version(sdk_root, service).split(';') stable_version = versions[1] diff --git a/eng/mgmt/automation/generate.py b/eng/mgmt/automation/generate.py index da692c27e539..1c56b9e154b7 100755 --- a/eng/mgmt/automation/generate.py +++ b/eng/mgmt/automation/generate.py @@ -24,7 +24,7 @@ ) from generate_utils import ( compare_with_maven_package, - compile_package, + compile_arm_package, generate, get_and_update_service_from_api_specs, get_suffix_from_api_specs, @@ -187,7 +187,7 @@ def sdk_automation_autorest(config: dict) -> List[dict]: tag=tag, ) if succeeded: - compile_package(sdk_root, module) + compile_arm_package(sdk_root, module) packages.append({ 'packageName': @@ -256,7 +256,7 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict: update_root_pom(sdk_root, service) # compile - succeeded = compile_package(sdk_root, module) + succeeded = compile_arm_package(sdk_root, module) # output if sdk_folder and module and service: @@ -359,7 +359,7 @@ def main(): ) if succeeded: - succeeded = compile_package(sdk_root, module) + succeeded = compile_arm_package(sdk_root, module) if succeeded: compare_with_maven_package(sdk_root, service, stable_version, current_version, module) diff --git a/eng/mgmt/automation/generate_data.py b/eng/mgmt/automation/generate_data.py index aee8301e8d57..fa885c58a0e9 100755 --- a/eng/mgmt/automation/generate_data.py +++ b/eng/mgmt/automation/generate_data.py @@ -335,7 +335,11 @@ def compile_package(sdk_root: str, group_id: str, module: str) -> bool: sdk_root, group_id, module) logging.info(command) if os.system(command) != 0: - logging.error('[COMPILE] Maven build fail') + error_message = ('[COMPILE] Maven build fail.\n' + 'One reason of the compilation failure is that the existing code customization in SDK repository being incompatible with the class generated from updated TypeSpec source. In such case, you can ignore the failure, and fix the customization in SDK repository.\n' + 'You can inquire in "Language - Java" Teams channel. Please include the link of this Pull Request in the query.') + logging.error(error_message) + print(error_message, file=sys.stderr) return False return True diff --git a/eng/mgmt/automation/generate_utils.py b/eng/mgmt/automation/generate_utils.py index 8194eae9be2b..422db00d3471 100644 --- a/eng/mgmt/automation/generate_utils.py +++ b/eng/mgmt/automation/generate_utils.py @@ -95,7 +95,7 @@ def generate( return True -def compile_package(sdk_root, module) -> bool: +def compile_arm_package(sdk_root: str, module: str) -> bool: if os.system( 'mvn --no-transfer-progress clean verify -f {0}/pom.xml -Dmaven.javadoc.skip -Dgpg.skip -DskipTestCompile -Djacoco.skip -Drevapi.skip -pl {1}:{2} -am'.format( sdk_root, GROUP_ID, module)) != 0: diff --git a/eng/mgmt/automation/parameters.py b/eng/mgmt/automation/parameters.py index 158efbd6c896..85fe90bc5d0a 100644 --- a/eng/mgmt/automation/parameters.py +++ b/eng/mgmt/automation/parameters.py @@ -16,7 +16,7 @@ SDK_ROOT = '../../../' # related to file dir AUTOREST_CORE_VERSION = '3.9.7' -AUTOREST_JAVA = '@autorest/java@4.1.28' +AUTOREST_JAVA = '@autorest/java@4.1.29' DEFAULT_VERSION = '1.0.0-beta.1' GROUP_ID = 'com.azure.resourcemanager' API_SPECS_FILE = 'api-specs.yaml' diff --git a/eng/mgmt/automation/sdk_generate.py b/eng/mgmt/automation/sdk_generate.py index e6ffeaceeccc..d1d1e9a0a51e 100755 --- a/eng/mgmt/automation/sdk_generate.py +++ b/eng/mgmt/automation/sdk_generate.py @@ -20,7 +20,7 @@ ) from generate_utils import ( compare_with_maven_package, - compile_package, + compile_arm_package, generate, get_and_update_service_from_api_specs, get_suffix_from_api_specs, @@ -215,7 +215,7 @@ def sdk_automation_autorest(config: dict) -> List[dict]: tag = tag, ) if succeeded: - compile_package(sdk_root, module) + compile_arm_package(sdk_root, module) packages.append({ 'packageName': @@ -294,7 +294,7 @@ def main(): ) if succeeded: - succeeded = compile_package(sdk_root, module) + succeeded = compile_arm_package(sdk_root, module) if succeeded: compare_with_maven_package(sdk_root, service, stable_version, current_version, module)