Skip to content

mgmt tsp, fix api-version in generated XXManager entry #43873

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
XiaofeiCao merged 3 commits into from
Jan 24, 2025
Merged

mgmt tsp, fix api-version in generated XXManager entry #43873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f9075f
add package version
XiaofeiCao Dec 18, 2024
2a1fffd
default version
XiaofeiCao Jan 23, 2025
45c07d6
use set_or_default_version and add version parameter
XiaofeiCao Jan 23, 2025
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
2 changes: 1 addition & 1 deletion eng/automation/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def main():
tsp_config = args["tsp_config"]

succeeded, require_sdk_integration, sdk_folder, service, module = generate_typespec_project(
tsp_project=tsp_config, sdk_root=sdk_root, remove_before_regen=True, group_id=GROUP_ID
tsp_project=tsp_config, sdk_root=sdk_root, remove_before_regen=True, group_id=GROUP_ID, **args
)

stable_version, current_version = set_or_increase_version(sdk_root, GROUP_ID, module, **args)
Expand Down
6 changes: 6 additions & 0 deletions eng/automation/generate_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from utils import update_root_pom
from utils import update_version
from utils import is_windows
from utils import set_or_default_version

os.chdir(pwd)

Expand Down Expand Up @@ -333,6 +334,8 @@ def generate_typespec_project(
repo_url: str = "",
remove_before_regen: bool = False,
group_id: str = None,
version: str = None,
**kwargs,
):

if not tsp_project:
Expand Down Expand Up @@ -411,6 +414,9 @@ def generate_typespec_project(
# clear existing generated source code, and regenerate
drop_changes(sdk_root)
remove_generated_source_code(sdk_folder, f"{group_id}.{service}")
_, current_version = set_or_default_version(sdk_root, group_id, module, version=version)
tsp_cmd.append("--emitter-options")
tsp_cmd.append(f'package-version={current_version}')
# regenerate
check_call(tsp_cmd, sdk_root)
succeeded = True
Expand Down
7 changes: 7 additions & 0 deletions eng/automation/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ def set_or_default_version(
sdk_root: str,
group: str,
module: str,
version=None,
) -> Tuple[str, str]:
version_file = os.path.join(sdk_root, "eng/versioning/version_client.txt")
project = "{0}:{1}".format(group, module)
Expand Down Expand Up @@ -288,6 +289,9 @@ def set_or_default_version(
stable_version = ""
current_version = default_version

if version:
current_version = version

if not stable_version:
stable_version = current_version

Expand Down Expand Up @@ -346,7 +350,10 @@ def set_or_increase_version(
write_version(version_file, lines, version_index, project, stable_version, version)
return stable_version, version

# 1.0.0-beta.1 -> [1,0,0,"-beta.1"]
current_versions = list(re.findall(version_pattern, current_version)[0])
# 1.0.0 -> [(1,0,0,"")]
# 1.0.0-beta.1 -> [(1,0,0,"-beta.1")]
stable_versions = re.findall(version_pattern, stable_version)
# no stable version
if len(stable_versions) < 1 or stable_versions[0][-1] != "":
Expand Down
Loading