Skip to content
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

Servicing docs improvements #85731

Merged

Conversation

carlossanlop
Copy link
Member

Adding more details to our servicing documentation, particularly around the check-servicing-labels CI leg.

Starting with the 7.0-staging branch to confirm the CI workflow changes work, then will backport to 7.0, 6.0-staging, 6.0, and finally to main.

Also want to confirm if:

  • An "echo" message can show the link to a md file properly.
  • The PR template can link to the current branch's doc, instead of the main doc.

@carlossanlop carlossanlop added documentation Documentation bug or enhancement, does not impact product or test code area-Infrastructure labels May 3, 2023
@carlossanlop carlossanlop self-assigned this May 3, 2023
@ghost
Copy link

ghost commented May 3, 2023

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

Issue Details

Adding more details to our servicing documentation, particularly around the check-servicing-labels CI leg.

Starting with the 7.0-staging branch to confirm the CI workflow changes work, then will backport to 7.0, 6.0-staging, 6.0, and finally to main.

Also want to confirm if:

  • An "echo" message can show the link to a md file properly.
  • The PR template can link to the current branch's doc, instead of the main doc.
Author: carlossanlop
Assignees: carlossanlop
Labels:

documentation, area-Infrastructure

Milestone: -

docs/project/library-servicing.md Outdated Show resolved Hide resolved
.github/workflows/check-service-labels.yml Outdated Show resolved Hide resolved
@ghost ghost added the needs-author-action An issue or pull request that requires more info or actions from the author. label May 4, 2023
@ghost ghost removed the needs-author-action An issue or pull request that requires more info or actions from the author. label May 5, 2023
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
@hoyosjs hoyosjs added the Servicing-approved Approved for servicing release label May 6, 2023
@hoyosjs hoyosjs merged commit 5b71fde into dotnet:release/7.0-staging May 6, 2023
@hoyosjs
Copy link
Member

hoyosjs commented May 6, 2023

/backport to main

@github-actions
Copy link
Contributor

github-actions bot commented May 6, 2023

Started backporting to main: https://github.com/dotnet/runtime/actions/runs/4898788375

@hoyosjs
Copy link
Member

hoyosjs commented May 6, 2023

/backport to release/6.0-staging

@github-actions
Copy link
Contributor

github-actions bot commented May 6, 2023

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/4898789433

@github-actions
Copy link
Contributor

github-actions bot commented May 6, 2023

@hoyosjs backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Servicing docs improvements
Using index info to reconstruct a base tree...
M	.github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md
M	docs/project/library-servicing.md
Falling back to patching base and 3-way merge...
Auto-merging docs/project/library-servicing.md
Auto-merging .github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md
CONFLICT (content): Merge conflict in .github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Servicing docs improvements
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Contributor

github-actions bot commented May 6, 2023

@hoyosjs an error occurred while backporting to release/6.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@carlossanlop
Copy link
Member Author

@hoyosjs thanks for trying, but backport can't be easily done with these changes. I'll submit the rest of the PRs manually.

@carlossanlop carlossanlop deleted the ImproveServicingDocs branch May 8, 2023 20:23
@ghost ghost locked as resolved and limited conversation to collaborators Jun 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Infrastructure documentation Documentation bug or enhancement, does not impact product or test code Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants