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

limit updates for stable to the current Major.Minor (backport #881) #884

Merged
merged 5 commits into from
Jul 31, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 31, 2024

GitHub Issue (If applicable): closes #

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Refactoring (no functional changes, no api changes)
  • Project automation

What is the current behavior?

The updater will always get the latest stable version while updating

What is the new behavior?

The updater will force updates to be patches/service releases in the same Major.Minor release channel from when the stable release was made. The latest release will be picked for main branch/dev builds.


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

(cherry picked from commit 509a186)

# Conflicts:
#	tools/Uno.Sdk.Updater/Program.cs
#	tools/Uno.Sdk.Updater/Services/NuGetClient.cs
(cherry picked from commit e4063e6)

# Conflicts:
#	tools/Uno.Sdk.Updater/Services/NuGetClient.cs
(cherry picked from commit 7f698d5)

# Conflicts:
#	tools/Uno.Sdk.Updater/Services/NuGetClient.cs
(cherry picked from commit 00084dc)
Copy link
Author

mergify bot commented Jul 31, 2024

Cherry-pick of 509a186 has failed:

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

You are currently cherry-picking commit 509a186.
  (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:   tools/Uno.Sdk.Updater/Program.cs
	both modified:   tools/Uno.Sdk.Updater/Services/NuGetClient.cs

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

Cherry-pick of e4063e6 has failed:

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

You are currently cherry-picking commit e4063e6.
  (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:   tools/Uno.Sdk.Updater/Services/NuGetClient.cs

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

Cherry-pick of 7f698d5 has failed:

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

You are currently cherry-picking commit 7f698d5.
  (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:   tools/Uno.Sdk.Updater/Program.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tools/Uno.Sdk.Updater/Services/NuGetClient.cs

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

@dansiegel dansiegel force-pushed the mergify/bp/release/stable/5.3/pr-881 branch from 5cdef10 to 038b233 Compare July 31, 2024 16:08
@dansiegel dansiegel merged commit e85cc48 into release/stable/5.3 Jul 31, 2024
5 checks passed
@dansiegel dansiegel deleted the mergify/bp/release/stable/5.3/pr-881 branch July 31, 2024 16:11
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