Skip to content

Update versioning for SM 6.10 2605 preview release #8395

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
tex3d merged 5 commits into from
Apr 22, 2026
+14 −7
Merged

Update versioning for SM 6.10 2605 preview release #8395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0dd7d61
Update versioning for 2605 preview release
tex3d Apr 21, 2026
54c62d7
Change minor back to 9 and fix rev
tex3d Apr 21, 2026
2276cf5
Back out ReleaseNotes.md change for separate PR to address
tex3d Apr 21, 2026
e3f2ffb
gen_version.py: use preview_minor to override release minor for previ…
tex3d Apr 21, 2026
75fa7ad
add preview_minor to latest-release.json
tex3d Apr 21, 2026
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
8 changes: 7 additions & 1 deletion utils/version/gen_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,13 @@ def rc_version_field_1(self):
return self.latest_release_info["version"]["major"]

def rc_version_field_2(self):
return self.latest_release_info["version"]["minor"]
minor = self.latest_release_info["version"]["minor"]
# If this is a preview branch, we use the preview_minor field as the
# minor version in the RC file. This allows us to have a different
# minor version for preview releases, without changing the highest
# released minor version.
minor = self.latest_release_info["version"].get("preview_minor", minor)
Copy link
Copy Markdown
Collaborator

@V-FEXrt V-FEXrt Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is not a branch here so this just always overrides the value? (which is okay because we are branched off main?)

Copy link
Copy Markdown
Contributor Author

@tex3d tex3d Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the idea was only to add the value on the preview branch.

Now the way I was talking about it on the other thread about potentially using it on the main branch isn't going to work the way it is today, so we'd have to think about how we want that to work more later for main. For now, I'd want to merge just this change to gen_version.py to main so subsequent previews branched off main can just set the json property like this branch did.

return minor

def rc_version_field_3(self):
return self.latest_release_info["version"]["rev"] if self.options.official else "0"
Expand Down
5 changes: 3 additions & 2 deletions utils/version/latest-release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"version": {
"major": "1",
"minor": "9",
"rev": "2602"
"preview_minor": "10",
"rev": "2605"
},
"sha": "f255809c3dd408c32349d6b7b16019b8b24e1d2e"
"sha": "c763461468246fb779fb234b08ad3b460fb93a02"
}
8 changes: 4 additions & 4 deletions utils/version/version.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
#ifdef RC_VERSION_FIELD_2
#undef RC_VERSION_FIELD_2
#endif
#define RC_VERSION_FIELD_2 9
#define RC_VERSION_FIELD_2 10

#ifdef RC_VERSION_FIELD_3
#undef RC_VERSION_FIELD_3
#endif
#define RC_VERSION_FIELD_3 2602
#define RC_VERSION_FIELD_3 2605

#ifdef RC_VERSION_FIELD_4
#undef RC_VERSION_FIELD_4
Expand All @@ -28,7 +28,7 @@
#ifdef RC_FILE_VERSION
#undef RC_FILE_VERSION
#endif
#define RC_FILE_VERSION "1.9.2602.0"
#define RC_FILE_VERSION "1.10.2605.0"
Copy link
Copy Markdown
Collaborator

@V-FEXrt V-FEXrt Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretty sure this it intended but calling out that its showing 1.10 just in case it wasn't

Copy link
Copy Markdown
Contributor Author

@tex3d tex3d Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, good point. I'm not sure how extensive the impact of the json version is, so I should update these back to 9 for consistency.

Copy link
Copy Markdown
Contributor Author

@tex3d tex3d Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, but I'm not sure I want to change the binary file versions this way...

Copy link
Copy Markdown
Contributor Author

@tex3d tex3d Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We used to update the version in the json for the preview, but that was before we drove a highest_released_minor from that value. I think it makes sense to leave the json, since it's not the released version that's incremented, but then to also update the file version for the preview. But since there have been changes to build scripts/pipelines and versioning components, I don't know for sure whether the version.inc file is even used for the official release build, or if a different one is generated from the json dynamically instead. I need to double-check some things.

Copy link
Copy Markdown
Contributor Author

@tex3d tex3d Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, my latest push adds a preview_minor to the version info in latest-release.json to support overriding the minor version in gen_version.py for preview releases without disturbing the highest released DXIL version.

Copy link
Copy Markdown
Contributor Author

@tex3d tex3d Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could likely merge such a change to main and extend this mechanism to avoid manually updating the DXIL version in hctdb_instrhelp.py separately. The preview_minor would always be the highest supported experimental/preview version, and any version higher than the released minor version gets the PREVIEW hash from validation.

Copy link
Copy Markdown
Collaborator

@V-FEXrt V-FEXrt Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I don't think we do that here but getting that into main would be a nice QOL change

Copy link
Copy Markdown
Contributor Author

@tex3d tex3d Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I said here wouldn't work properly for main yet, but we could think about what would work and adjust accordingly.


#ifdef RC_FILE_DESCRIPTION
#undef RC_FILE_DESCRIPTION
Expand All @@ -49,7 +49,7 @@
#ifdef RC_PRODUCT_VERSION
#undef RC_PRODUCT_VERSION
#endif
#define RC_PRODUCT_VERSION "1.9.2602.0"
#define RC_PRODUCT_VERSION "1.10.2605.0"

#ifdef HLSL_TOOL_NAME
#undef HLSL_TOOL_NAME
Expand Down
Loading