Skip to content

ci: conflict sebastian/comparator #6032

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

Merged
merged 2 commits into from
Dec 13, 2023
Merged

Conversation

soyuka
Copy link
Member

@soyuka soyuka commented Dec 9, 2023

No description provided.

@soyuka soyuka force-pushed the ci/phpunit-conflict branch from 67470cf to 89768f7 Compare December 13, 2023 10:03
composer.json Outdated
@@ -95,7 +95,8 @@
"doctrine/mongodb-odm": "<2.4",
"doctrine/persistence": "<1.3",
"symfony/var-exporter" : "<6.1.1",
"phpunit/phpunit": "<9.5",
"phpunit/phpunit": "<9.5",
Copy link
Member

Choose a reason for hiding this comment

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

This should work even without this line.

Copy link
Member Author

Choose a reason for hiding this comment

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

yes mb I was doing many things at once ^^

Copy link
Member Author

Choose a reason for hiding this comment

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

actually we need this for our lowest tests I'll probably move this to the ci though

@soyuka soyuka force-pushed the ci/phpunit-conflict branch from 89768f7 to d2b5d16 Compare December 13, 2023 13:29
@soyuka soyuka force-pushed the ci/phpunit-conflict branch from 62a236e to 81301c6 Compare December 13, 2023 14:09
@soyuka soyuka merged commit 27f15a3 into api-platform:3.2 Dec 13, 2023
Romaixn pushed a commit to Romaixn/core that referenced this pull request Jan 5, 2024
* ci: conflict sebastian/comparator

* for lowest
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants