Skip to content

Commit c86b87e

Browse files
eng, update autorest.java, improve error output in sdk automation (Azure#40073)
* improve error output * autorest.java 4.1.29
1 parent f01f7f4 commit c86b87e

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

eng/mgmt/automation/changelog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from parameters import *
1010
from generate import update_parameters
1111
from generate_utils import get_version
12-
from generate import compile_package
12+
from generate_utils import compile_arm_package
1313
from generate import compare_with_maven_package
1414

1515
os.chdir(pwd)
@@ -31,7 +31,7 @@ def main():
3131
update_parameters(args.get('suffix'))
3232

3333
if args.get('compile'):
34-
compile_package(sdk_root, service)
34+
compile_arm_package(sdk_root, service)
3535

3636
versions = get_version(sdk_root, service).split(';')
3737
stable_version = versions[1]

eng/mgmt/automation/generate.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
)
2525
from generate_utils import (
2626
compare_with_maven_package,
27-
compile_package,
27+
compile_arm_package,
2828
generate,
2929
get_and_update_service_from_api_specs,
3030
get_suffix_from_api_specs,
@@ -187,7 +187,7 @@ def sdk_automation_autorest(config: dict) -> List[dict]:
187187
tag=tag,
188188
)
189189
if succeeded:
190-
compile_package(sdk_root, module)
190+
compile_arm_package(sdk_root, module)
191191

192192
packages.append({
193193
'packageName':
@@ -256,7 +256,7 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
256256
update_root_pom(sdk_root, service)
257257

258258
# compile
259-
succeeded = compile_package(sdk_root, module)
259+
succeeded = compile_arm_package(sdk_root, module)
260260

261261
# output
262262
if sdk_folder and module and service:
@@ -359,7 +359,7 @@ def main():
359359
)
360360

361361
if succeeded:
362-
succeeded = compile_package(sdk_root, module)
362+
succeeded = compile_arm_package(sdk_root, module)
363363
if succeeded:
364364
compare_with_maven_package(sdk_root, service, stable_version,
365365
current_version, module)

eng/mgmt/automation/generate_data.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,11 @@ def compile_package(sdk_root: str, group_id: str, module: str) -> bool:
335335
sdk_root, group_id, module)
336336
logging.info(command)
337337
if os.system(command) != 0:
338-
logging.error('[COMPILE] Maven build fail')
338+
error_message = ('[COMPILE] Maven build fail.\n'
339+
'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'
340+
'You can inquire in "Language - Java" Teams channel. Please include the link of this Pull Request in the query.')
341+
logging.error(error_message)
342+
print(error_message, file=sys.stderr)
339343
return False
340344
return True
341345

eng/mgmt/automation/generate_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def generate(
9595
return True
9696

9797

98-
def compile_package(sdk_root, module) -> bool:
98+
def compile_arm_package(sdk_root: str, module: str) -> bool:
9999
if os.system(
100100
'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(
101101
sdk_root, GROUP_ID, module)) != 0:

eng/mgmt/automation/parameters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
SDK_ROOT = '../../../' # related to file dir
1818
AUTOREST_CORE_VERSION = '3.9.7'
19-
AUTOREST_JAVA = '@autorest/[email protected].28'
19+
AUTOREST_JAVA = '@autorest/[email protected].29'
2020
DEFAULT_VERSION = '1.0.0-beta.1'
2121
GROUP_ID = 'com.azure.resourcemanager'
2222
API_SPECS_FILE = 'api-specs.yaml'

eng/mgmt/automation/sdk_generate.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
)
2121
from generate_utils import (
2222
compare_with_maven_package,
23-
compile_package,
23+
compile_arm_package,
2424
generate,
2525
get_and_update_service_from_api_specs,
2626
get_suffix_from_api_specs,
@@ -215,7 +215,7 @@ def sdk_automation_autorest(config: dict) -> List[dict]:
215215
tag = tag,
216216
)
217217
if succeeded:
218-
compile_package(sdk_root, module)
218+
compile_arm_package(sdk_root, module)
219219

220220
packages.append({
221221
'packageName':
@@ -294,7 +294,7 @@ def main():
294294
)
295295

296296
if succeeded:
297-
succeeded = compile_package(sdk_root, module)
297+
succeeded = compile_arm_package(sdk_root, module)
298298
if succeeded:
299299
compare_with_maven_package(sdk_root, service, stable_version,
300300
current_version, module)

0 commit comments

Comments
 (0)