Skip to content

[SYCL] Add guidelines for working on release branches #17042

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.

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

Conversation

AlexeySachkov
Copy link
Contributor

No description provided.

@AlexeySachkov AlexeySachkov requested review from a team and tfzhu as code owners February 18, 2025 12:36
@AlexeySachkov AlexeySachkov requested a review from a team February 18, 2025 12:37
@AlexeySachkov
Copy link
Contributor Author

@intel/llvm-gatekeepers, tagging you explicitly for review, because suggested changes are about our general processes

### Only cherry-picks are allowed

It is assumed, that everything you do on a release branch, should also be
repeated on the main branch to ensure that it is automatically included into
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps this should be the default branch instead of the main branch to avoid confusion with the upstream main branch which exists but is not the default?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Addressed this in d3a51ea

@@ -1,3 +1,21 @@
# Release notes for an upcoming release (dates TBD)
Copy link
Contributor

@dm-vodopyanov dm-vodopyanov Feb 18, 2025

Choose a reason for hiding this comment

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

should we also mention a link to tag/branch? sycl-rel-***

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We don't have that branch yet and in general case, we may not even know the next version in advance (i.e. whether it will be X.Y+1 or X+1.0)


A change should **not** be noted there when:

- It has no functional and performance impact
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe also add here any direct changes in our dependencies? Like UR, etc

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If UR change fixes a bug observable on a SYCL level, I would personally prefer it documented

consistency it is better to follow the existing structure without disrupting it
much. The structure we have been using so far is split by change type (i.e. new
features and bug fixes) and then sub-split by component (i.e. compiler,
runtime). Please use past tense when describing your change.
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe add that links must be permalinks to avoid dead links in the future?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, good point, clarified that in ee3ecc7

Comment on lines 5 to 6
Those branches are intended to indicate stable snapshots of our product so that
our users don't need to guess which nightly build is good enough for our needs.
Copy link
Contributor

Choose a reason for hiding this comment

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

Optionally:

Suggested change
Those branches are intended to indicate stable snapshots of our product so that
our users don't need to guess which nightly build is good enough for our needs.
Those branches are intended to indicate stable snapshots of SYCL compiler
in comparison with non-stable nightly snapshots.

release branch and then apply it to the main `sycl` branch. The flow goes in
the opposite direction where you first land a patch to the main branch and then
backport it to a release branch.

Copy link
Contributor

Choose a reason for hiding this comment

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

Should we add somewhere that if some failure is observed in pre-commit, author of PR should create an issue with specific tag indicating the release (if adding GH tag is not possible due to permissions, issue caption must have a tag in text format like [REL-***]

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I suppose that rules about creating issues for release branches (and any special markup for them) should probably be documented elsewhere in a generic manner (i.e. even for those who do not contribute to release branches, but uses them). But I don't know what this place would be.

Specifically for pre-commit issues observed at release branches, I would prefer to have stricter rules, i.e. it seems wrong to merge a PR with a new failure in a pre-commit into release branch

Copy link
Contributor

@ldrumm ldrumm left a comment

Choose a reason for hiding this comment

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

Looks good modulo minor spelling, grammar, and style nits

Copy link
Contributor

@steffenlarsen steffenlarsen left a comment

Choose a reason for hiding this comment

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

I like it!

@AlexeySachkov
Copy link
Contributor Author

I'm going to proceed with the merge to have some baseline ready. Any further feedback can be applied post-commit (and I still have a TODO item in my list to address @dm-vodopyanov's comment about submitting issues against release branches)

@AlexeySachkov AlexeySachkov merged commit cce5dac into intel:sycl Mar 11, 2025
4 checks passed
@AlexeySachkov AlexeySachkov deleted the private/asachkov/dev-docs-update branch March 11, 2025 09:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants