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

Misc test updates (backport #18387) #18396

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 5, 2024


This is an automatic backport of pull request #18387 done by [Mergify](https://mergify.com).

jeromelaban and others added 25 commits October 5, 2024 20:52
(cherry picked from commit 14e59f3)
(cherry picked from commit 622ed96)
On iOS simulators on CI, the navigation can be very slow.

(cherry picked from commit 696e3bc)

# Conflicts:
#	src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_WebView2.cs
#	src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_WebView.cs
(cherry picked from commit 21bdd95)
(cherry picked from commit 302378d)
(cherry picked from commit 9aee7a9)
(cherry picked from commit 29faf4b)
(cherry picked from commit 4b3cbaa)
(cherry picked from commit f0b6abc)
(cherry picked from commit 81d69be)
(cherry picked from commit 28c0ba0)
(cherry picked from commit 8dee4f7)
(cherry picked from commit 41fc61a)
(cherry picked from commit 521bcd1)
@mergify mergify bot added the conflicts label Oct 5, 2024
Copy link
Contributor Author

mergify bot commented Oct 5, 2024

Cherry-pick of 696e3bc has failed:

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

You are currently cherry-picking commit 696e3bc96d.
  (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:   src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_WebView2.cs
	both modified:   src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_WebView.cs

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 Oct 5, 2024
@github-actions github-actions bot added platform/android 🤖 Categorizes an issue or PR as relevant to the Android platform area/build Categorizes an issue or PR as relevant to build infrastructure labels Oct 5, 2024
@github-actions github-actions bot added the area/automation Categorizes an issue or PR as relevant to project automation label Oct 5, 2024
@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-18396/index.html

@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18396/index.html

@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-18396/index.html

@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18396/index.html

@jeromelaban jeromelaban merged commit a0d9fa8 into release/stable/5.4 Oct 6, 2024
97 of 100 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.4/pr-18387 branch October 6, 2024 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/automation Categorizes an issue or PR as relevant to project automation area/build Categorizes an issue or PR as relevant to build infrastructure conflicts platform/android 🤖 Categorizes an issue or PR as relevant to the Android platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants