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

build: Few build adjustments to reduce flakiness (backport #700) #702

Merged
merged 2 commits into from
Aug 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 8, 2023

This is an automatic backport of pull request #700 done by Mergify.
Cherry-pick of f622a0d has failed:

On branch mergify/bp/legacy/3x/pr-700
Your branch is up to date with 'origin/legacy/3x'.

You are currently cherry-picking commit f622a0d.
  (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:   build/workflow/stage-build-packages.yml
	modified:   src/Directory.Packages.props
	modified:   src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   samples/Directory.Packages.props
	deleted by us:   samples/Uno.Toolkit.Samples/Directory.Build.targets
	both modified:   src/Directory.Build.targets

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: Steve Bilogan <steve.bilogan@gmail.com>
(cherry picked from commit f622a0d)

# Conflicts:
#	samples/Directory.Packages.props
#	samples/Uno.Toolkit.Samples/Directory.Build.targets
#	src/Directory.Build.targets
@agneszitte agneszitte merged commit 61c9302 into legacy/3x Aug 11, 2023
28 checks passed
@agneszitte agneszitte deleted the mergify/bp/legacy/3x/pr-700 branch August 11, 2023 22:08
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.

None yet

4 participants