Skip to content

Add release branches to build (backport #3193)#3204

Merged
dansiegel merged 4 commits intorelease/stable/9.0from
mergify/bp/release/stable/9.0/pr-3193
Jul 22, 2024
Merged

Add release branches to build (backport #3193)#3204
dansiegel merged 4 commits intorelease/stable/9.0from
mergify/bp/release/stable/9.0/pr-3193

Conversation

@mergify
Copy link

@mergify mergify bot commented Jul 22, 2024

Description of Change

Add release branches to build


This is an automatic backport of pull request #3193 done by Mergify.

(cherry picked from commit ae7ff2b)

# Conflicts:
#	.github/workflows/ci.yml
(cherry picked from commit f6e4832)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/publish-release.yml
(cherry picked from commit 1891bfa)

# Conflicts:
#	.github/workflows/publish-release.yml
@mergify mergify bot added the conflicts label Jul 22, 2024
@mergify
Copy link
Author

mergify bot commented Jul 22, 2024

Cherry-pick of ae7ff2b has failed:

On branch mergify/bp/release/stable/9.0/pr-3193
Your branch is up to date with 'origin/release/stable/9.0'.

You are currently cherry-picking commit ae7ff2b8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of f6e4832 has failed:

On branch mergify/bp/release/stable/9.0/pr-3193
Your branch is ahead of 'origin/release/stable/9.0' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f6e48324.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/build_core.yml
	modified:   .github/workflows/build_forms.yml
	modified:   .github/workflows/build_maui.yml
	modified:   .github/workflows/build_uno.yml
	modified:   .github/workflows/build_wpf.yml
	modified:   .github/workflows/start-release.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml
	both modified:   .github/workflows/publish-release.yml

Cherry-pick of 1891bfa has failed:

On branch mergify/bp/release/stable/9.0/pr-3193
Your branch is ahead of 'origin/release/stable/9.0' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1891bfaf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/publish-release.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jul 22, 2024
@dansiegel dansiegel merged commit 34befea into release/stable/9.0 Jul 22, 2024
@dansiegel dansiegel deleted the mergify/bp/release/stable/9.0/pr-3193 branch July 22, 2024 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant