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

Manually merge 3.0.x into master #4352

Merged
merged 60 commits into from
Oct 19, 2020
Merged

Manually merge 3.0.x into master #4352

merged 60 commits into from
Oct 19, 2020

Conversation

morozov
Copy link
Member

@morozov morozov commented Oct 17, 2020

No description provided.

morozov and others added 30 commits October 12, 2020 18:50
This must have been forgotten in a previous commit I made about this.
Using moving aliases has proven troublesome in the past.
Add Statement::fetchAllKeyValue() and ::iterateKeyValue()
When we push to a branch on origin and make a PR, we see double the
normal amount of jobs because of this.
I somehow missed another occurrence.
The end goal is to have a generic workflow that can be contributed back
to our .github repository.
It is more concise.
Add Statement::fetchAllIndexedAssociative() and ::iterateIndexedAssociative()
It should be faster, and will result in one fewer CI platform to
maintain.
Minor CS improvement - use ::class for TestCase::expectException input
Migrate jobs away from Travis to Github Actions
Rename Comparator::diffTable() params - from/to instead of 1/2
@morozov
Copy link
Member Author

morozov commented Oct 17, 2020

Let's wait until #4353 is resolved and merged up. This will also pull in the changes from #4348.

@morozov morozov force-pushed the master branch 3 times, most recently from aaa48b6 to fab30b8 Compare October 19, 2020 00:47
@morozov
Copy link
Member Author

morozov commented Oct 19, 2020

@greg0ire some jobs didn't start even after I reopened the PR. Not sure where "PHPUnit with IBM DB2 (8.0)" comes from. It's no in the build matrics and isn't expected to work yet. For the reference, #4351 also had 55 jobs but there wasn't "PHPUnit with IBM DB2 (8.0)" there.

P.S.: I set all PHPUnit jobs except for "minimum-stability dev" to required in the branch settings.

UPD: I disabled the missing checks as required similarly to how they are disabled for the older branches. But this doesn't look good.

@morozov morozov closed this Oct 19, 2020
@morozov morozov reopened this Oct 19, 2020
@morozov morozov requested a review from greg0ire October 19, 2020 02:36
Copy link
Member

@SenseException SenseException left a comment

Choose a reason for hiding this comment

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

All builds are green now.

@morozov morozov merged commit 5ec1778 into doctrine:master Oct 19, 2020
@morozov morozov self-assigned this Oct 19, 2020
@greg0ire
Copy link
Member

Not sure where "PHPUnit with IBM DB2 (8.0)" comes from.

@morozov I believe it comes from a try @derrabus did.

The setting will show you anything that happened, even it wasn't merged. That's why you may see pdo_mysql and pdo-mysql in the list, for instance.

@morozov
Copy link
Member Author

morozov commented Oct 19, 2020

Hm… how do we get them off the list? In my experience, removing Travis is quite non-straightforward. On a personal project, I ended up removing all the webhooks, etc. manually.

If somebody files a PR with the matrix changes, and they persist in our branch settings just because of that, it's quite disturbing.

@greg0ire
Copy link
Member

Hm… how do we get them off the list?

By waiting for one week I think 😅

Status checks found in the last week for this repository

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants