Skip to content

Use arcade backport workflow #8683

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

Jump to bottom
Merged
merged 1 commit into from
Oct 28, 2025
Merged

Use arcade backport workflow #8683

merged 1 commit into from
Oct 28, 2025

Conversation

@mmitche
Copy link
Member

@mmitche mmitche commented Oct 28, 2025

Summary
Release Notes Entry

@mmitche mmitche requested a review from a team as a code owner October 28, 2025 16:22
wiktork
wiktork reviewed Oct 28, 2025
View reviewed changes
@wiktork wiktork merged commit 28b89e4 into dotnet:main Oct 28, 2025
4 checks passed
@mmitche
Copy link
Member Author

mmitche commented Oct 28, 2025

/backport to release/8.0

@github-actions
Copy link
Contributor

github-actions bot commented Oct 28, 2025

Started backporting to release/8.0 (link to workflow run)

@github-actions
Copy link
Contributor

github-actions bot commented Oct 28, 2025

@mmitche backporting to release/8.0 failed, the patch most likely resulted in conflicts. Please backport manually!

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

Applying: Use arcade backport workflow
Using index info to reconstruct a base tree...
M	.github/workflows/backport.yml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/backport.yml
CONFLICT (content): Merge conflict in .github/workflows/backport.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Use arcade backport workflow
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@mmitche
Copy link
Member Author

mmitche commented Oct 28, 2025

/backport to release/9.0

@github-actions
Copy link
Contributor

github-actions bot commented Oct 28, 2025

Started backporting to release/9.0 (link to workflow run)

@github-actions github-actions bot mentioned this pull request Oct 28, 2025
Merged
mmitche added a commit to mmitche/dotnet-monitor that referenced this pull request Oct 28, 2025
@mmitche
Use arcade backport workflow (dotnet#8683)
4b6cabc
wiktork pushed a commit that referenced this pull request Oct 28, 2025
@mmitche
Use arcade backport workflow (#8683) (#8685)
6b444cb
wiktork pushed a commit that referenced this pull request Oct 28, 2025
@github-actions @dependabot @mmitche
[release/10.0] Sync branch with origin/main (#8686)
5311300 
* Bump actions/upload-artifact from 4.6.2 to 5.0.0 (#8682)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@ea165f8...330a01c)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump streetsidesoftware/cspell-action from 7.2.0 to 7.2.1 (#8681)

Bumps [streetsidesoftware/cspell-action](https://github.com/streetsidesoftware/cspell-action) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/streetsidesoftware/cspell-action/releases)
- [Changelog](https://github.com/streetsidesoftware/cspell-action/blob/main/CHANGELOG.md)
- [Commits](streetsidesoftware/cspell-action@dcd03dc...76c6f6d)

---
updated-dependencies:
- dependency-name: streetsidesoftware/cspell-action
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use arcade backport workflow (#8683)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
wiktork pushed a commit that referenced this pull request Nov 4, 2025
@github-actions @dependabot @mmitche
[release/10.0] Sync branch with origin/main (#8695)
39a46de 
* Bump actions/upload-artifact from 4.6.2 to 5.0.0 (#8682)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@ea165f8...330a01c)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump streetsidesoftware/cspell-action from 7.2.0 to 7.2.1 (#8681)

Bumps [streetsidesoftware/cspell-action](https://github.com/streetsidesoftware/cspell-action) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/streetsidesoftware/cspell-action/releases)
- [Changelog](https://github.com/streetsidesoftware/cspell-action/blob/main/CHANGELOG.md)
- [Commits](streetsidesoftware/cspell-action@dcd03dc...76c6f6d)

---
updated-dependencies:
- dependency-name: streetsidesoftware/cspell-action
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use arcade backport workflow (#8683)

* [main] Bump the identity-dependencies group with 1 update (#8666)

Bumps Microsoft.Identity.Web from 3.14.1 to 4.0.1

---
updated-dependencies:
- dependency-name: Microsoft.Identity.Web
  dependency-version: 4.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: identity-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [main] Bump Newtonsoft.Json from 13.0.3 to 13.0.4 (#8670)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-version: 13.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
wiktork pushed a commit that referenced this pull request Nov 5, 2025
@github-actions @dependabot @mmitche
[release/10.0] Sync branch with origin/main (#8706)
86fe956 
* Bump actions/upload-artifact from 4.6.2 to 5.0.0 (#8682)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@ea165f8...330a01c)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump streetsidesoftware/cspell-action from 7.2.0 to 7.2.1 (#8681)

Bumps [streetsidesoftware/cspell-action](https://github.com/streetsidesoftware/cspell-action) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/streetsidesoftware/cspell-action/releases)
- [Changelog](https://github.com/streetsidesoftware/cspell-action/blob/main/CHANGELOG.md)
- [Commits](streetsidesoftware/cspell-action@dcd03dc...76c6f6d)

---
updated-dependencies:
- dependency-name: streetsidesoftware/cspell-action
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use arcade backport workflow (#8683)

* [main] Bump the identity-dependencies group with 1 update (#8666)

Bumps Microsoft.Identity.Web from 3.14.1 to 4.0.1

---
updated-dependencies:
- dependency-name: Microsoft.Identity.Web
  dependency-version: 4.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: identity-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [main] Bump Newtonsoft.Json from 13.0.3 to 13.0.4 (#8670)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-version: 13.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update Learning Paths (#8693)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [main] Bump NJsonSchema from 11.0.0 to 11.5.1 (#8702)

---
updated-dependencies:
- dependency-name: NJsonSchema
  dependency-version: 11.5.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wiktork wiktork wiktork approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mmitche @wiktork