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

Update upmerge workflow to ignore config and body-end changes #1267

Merged
merged 2 commits into from
Nov 7, 2024

Conversation

sk593
Copy link
Contributor

@sk593 sk593 commented Nov 7, 2024

Thank you for helping make the Radius documentation better!

Please follow this checklist before submitting:

  • Read the contribution guide
  • Commands include options for Linux, MacOS, and Windows within codetabs
  • New file and folder names are globally unique
  • Page references use shortcodes instead of markdown or URL links
  • Images use HTML style and have alternative text
  • Places where multiple code/command options are given have codetabs

In addition, please fill out the following to help reviewers understand this pull request:

Description

We ignore certain files in the upmerge workflow that shouldn't get overwritten in edge. This was previously broken because we weren't resetting to the changes on edge. Instead, we were resetting to the changes after the merge.

Test run: https://github.com/sk593/radius-docs/actions/runs/11728935169/job/32673463501
Test branch with config/body-end changes: https://github.com/sk593/radius-docs/pull/3/files
Test PR opened from upmerge workflow (with no config/body-end changes): sk593#2

Issue reference

Signed-off-by: sk593 <[email protected]>
Signed-off-by: sk593 <[email protected]>
@sk593 sk593 merged commit d425e1d into radius-project:edge Nov 7, 2024
9 checks passed
@sk593 sk593 deleted the update-upmerge-workflow branch November 7, 2024 21:31
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.

3 participants