Skip to content

Commit e3f2ffb

Browse files
committed
gen_version.py: use preview_minor to override release minor for preview releases
In latest-release.json, for a preview release branch, set preview_minor to the preview version so that the released dxil version doesn't change, but gen_version.py has something to override the minor version for binary file versioning.
1 parent 2276cf5 commit e3f2ffb

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

utils/version/gen_version.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,13 @@ def rc_version_field_1(self):
8080
return self.latest_release_info["version"]["major"]
8181

8282
def rc_version_field_2(self):
83-
return self.latest_release_info["version"]["minor"]
83+
minor = self.latest_release_info["version"]["minor"]
84+
# If this is a preview branch, we use the preview_minor field as the
85+
# minor version in the RC file. This allows us to have a different
86+
# minor version for preview releases, without changing the highest
87+
# released minor version.
88+
minor = self.latest_release_info["version"].get("preview_minor", minor)
89+
return minor
8490

8591
def rc_version_field_3(self):
8692
return self.latest_release_info["version"]["rev"] if self.options.official else "0"

0 commit comments

Comments
 (0)