Skip to content

eng, update autorest.java, improve error output in sdk automation #40073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weidongxu-microsoft merged 4 commits into from
May 8, 2024
Merged

eng, update autorest.java, improve error output in sdk automation #40073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c55367b
improve error output
weidongxu-microsoft May 8, 2024
ee33e80
autorest.java 4.1.29
weidongxu-microsoft May 8, 2024
40cae21
rename compile_arm_package
weidongxu-microsoft May 8, 2024
ecba30b
add one guide about possible cause of compilation failure
weidongxu-microsoft May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/mgmt/automation/changelog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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]
Expand Down
8 changes: 4 additions & 4 deletions eng/mgmt/automation/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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':
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion eng/mgmt/automation/generate_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion eng/mgmt/automation/generate_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion eng/mgmt/automation/parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

SDK_ROOT = '../../../' # related to file dir
AUTOREST_CORE_VERSION = '3.9.7'
AUTOREST_JAVA = '@autorest/[email protected].28'
AUTOREST_JAVA = '@autorest/[email protected].29'
DEFAULT_VERSION = '1.0.0-beta.1'
GROUP_ID = 'com.azure.resourcemanager'
API_SPECS_FILE = 'api-specs.yaml'
Expand Down
6 changes: 3 additions & 3 deletions eng/mgmt/automation/sdk_generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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':
Expand Down Expand Up @@ -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)
Expand Down