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.

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

[iOS] Fix potential xctest deadlock causing CI test failures (uplift to 1.64.x) #22474

Merged
merged 1 commit into from
Mar 6, 2024
Merged

[iOS] Fix potential xctest deadlock causing CI test failures (uplift to 1.64.x) #22474

merged 1 commit into from
Mar 6, 2024

Conversation

kylehickinson
Copy link
Collaborator

@kylehickinson kylehickinson commented Mar 6, 2024 •
edited by kjozwiak
Loading

Uplift of #22446
Resolves brave/brave-browser#36536

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@kylehickinson
[iOS] Fix potential xctest deadlock causing CI test failures
f87250b 
This is a problem in Chromium 122 and 123, but is already fixed in 124, so this override should be removed then.
@kylehickinson kylehickinson added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 labels Mar 6, 2024
@kylehickinson kylehickinson requested a review from a team as a code owner March 6, 2024 15:25
kjozwiak
kjozwiak approved these changes Mar 6, 2024
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.64.x approved 👍

@kjozwiak kjozwiak merged commit 0e47bf4 into 1.64.x Mar 6, 2024
14 checks passed
@kjozwiak kjozwiak deleted the ios-xctest-crash-fix-pt2-1.64.x branch March 6, 2024 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@kylehickinson kylehickinson

Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64
Projects
None yet
Milestone
1.64.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@kylehickinson @kjozwiak