-
Notifications
You must be signed in to change notification settings - Fork 7.8k
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
CI: prepare for PHP-8.4 #16036
CI: prepare for PHP-8.4 #16036
Conversation
This PR should be targeted onto the PHP-8.4 branch, not the master branch. Otherwise the changes to the |
@TimWolla |
Yes, I understand that. But you nevertheless need to apply the changes to the PHP-8.4 branch and then merge them into master. Making the changes in master only will not have the desired effect. |
@@ -3,6 +3,6 @@ | |||
for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i | |||
for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i | |||
|
|||
if /i "%BRANCH%" equ "8.4" ( | |||
if /i "%BRANCH%" equ "8.5" ( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that this would have solved the failing CI on Windows. I wasn't aware of this file.
@TimWolla |
.github/workflows/nightly.yml
Outdated
@@ -422,6 +422,7 @@ jobs: | |||
- { branch: { name: 'PHP-8.1', ref: 'PHP-8.1', major: 8, minor: 1 }, type: 'verify_type_inference' } | |||
- { branch: { name: 'PHP-8.2', ref: 'PHP-8.2', major: 8, minor: 2 }, type: 'verify_type_inference' } | |||
- { branch: { name: 'PHP-8.3', ref: 'PHP-8.3', major: 8, minor: 3 }, type: 'verify_type_inference' } | |||
- { branch: { name: 'PHP-8.4', ref: 'PHP-8.4', major: 8, minor: 4 }, type: 'verify_type_inference' } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not necessary, inference verification works for this branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed!
2fe245a
to
dd674bf
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🙂
No description provided.