Merge ~bryce/ubuntu/+source/php-parser:merge-v4.10.4-1-hirsute into ubuntu/+source/php-parser:ubuntu/devel
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Bryce Harrington | ||||
Approved revision: | 827ae5e470860a9f3a809b4929dcc7d902a9573b | ||||
Merge reported by: | Bryce Harrington | ||||
Merged at revision: | 827ae5e470860a9f3a809b4929dcc7d902a9573b | ||||
Proposed branch: | ~bryce/ubuntu/+source/php-parser:merge-v4.10.4-1-hirsute | ||||
Merge into: | ubuntu/+source/php-parser:ubuntu/devel | ||||
Diff against target: |
186 lines (+146/-1) 5 files modified
debian/changelog (+14/-0) debian/control (+2/-1) debian/patches/0003-Disable-new-test-cases-not-yet-32-bit-compatible.patch (+57/-0) debian/patches/0004-Disable-CodeParsingTest-due-to-integer-syntax.patch (+71/-0) debian/patches/series (+2/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bryce Harrington (community) | Approve | ||
Sergio Durigan Junior (community) | Needs Fixing | ||
git-ubuntu developers | Pending | ||
Canonical Server | Pending | ||
Review via email: mp+396706@code.launchpad.net |
Description of the change
This is a re-do of the following MP:
https:/
As mentioned on that MP, Sergio ran into a build issue when he had -proposed enabled, presumably due to the version of phpunit in -proposed. As well, a new version sync'd in from debian, 4.10.4-1, thus this MP.
phpunit had been stuck in proposed due to a circular build dependency. It's still stuck in proposed but just due to some tests. So, it should be usable now on php-parser, and fixing php-parser will remove one of the issues preventing phpunit from migrating.
The changes here are essentially identical to what was proposed before. I've also verified it builds and autopkgtest passes for php-parser with phpunit 9.5:
autopkgtest [00:51:26]: test command1: -------
autopkgtest [00:51:26]: test command1: - - - - - - - - - - results - - - - - - - - - -
command1 PASS
autopkgtest [00:51:26]: @@@@@@@
command1 PASS
autopkgtest [00:51:26]: Binaries: resetting testbed apt configuration
triage-
phpunit:
Installed: 9.5.1-1
Candidate: 9.5.1-1
Version table:
*** 9.5.1-1 500
500 http://
100 /var/lib/
9.
500 http://
8.5.9-1 500
500 http://
PPA: https:/
I'm reviewing this one.