Skip to content

cadl, upgrade sdk automation script, for tooling changes #34136

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
Mar 24, 2023
Merged

cadl, upgrade sdk automation script, for tooling changes #34136

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b874545
migrate to typespec, keep backward compatible to .cadl
weidongxu-microsoft Mar 17, 2023
0be279d
Merge branch 'main' into upgrade-codegen
weidongxu-microsoft Mar 21, 2023
49ba652
cadl, update script for tooling change
weidongxu-microsoft Mar 21, 2023
02ac878
Update generate_data.py
raych1 Mar 23, 2023
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
6 changes: 3 additions & 3 deletions eng/mgmt/automation/generate_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ def sdk_automation_cadl(config: dict) -> List[dict]:
spec_root = os.path.abspath(config['specFolder'])

packages = []
if 'relatedCadlProjectFolder' not in config:
if 'relatedTypeSpecProjectFolder' not in config:
return packages

cadl_projects = config['relatedCadlProjectFolder']
cadl_projects = config['relatedTypeSpecProjectFolder']
if isinstance(cadl_projects, str):
cadl_projects = [cadl_projects]

Expand Down Expand Up @@ -118,7 +118,7 @@ def sdk_automation_cadl(config: dict) -> List[dict]:
'eng/versioning',
'pom.xml'
],
'cadlProject': [cadl_project],
'typeSpecProject': [cadl_project],
'packageFolder': sdk_folder,
'artifacts': artifacts,
'apiViewArtifact': next(iter(glob.glob('{0}/target/*-sources.jar'.format(sdk_folder))), None),
Expand Down