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

CI: prepare for PHP-8.4 #16036

Merged
merged 2 commits into from
Sep 25, 2024
Merged

CI: prepare for PHP-8.4 #16036

merged 2 commits into from
Sep 25, 2024

Conversation

SakiTakamachi
Copy link
Member

No description provided.

@TimWolla
Copy link
Member

This PR should be targeted onto the PHP-8.4 branch, not the master branch. Otherwise the changes to the push.yml will not have an effect.

@SakiTakamachi
Copy link
Member Author

@TimWolla
Sorry, the title may have been difficult to understand.... This is a change to bring the master branch to 8.5 since the new PHP-8.4 branch has been created.

@TimWolla
Copy link
Member

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" (
Copy link
Member

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.

@SakiTakamachi
Copy link
Member Author

@TimWolla
Ahhhh, I understand, thanks!

@@ -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' }
Copy link
Member

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.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed!

@SakiTakamachi SakiTakamachi marked this pull request as ready for review September 25, 2024 11:29
Copy link
Member

@iluuu1994 iluuu1994 left a comment

Choose a reason for hiding this comment

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

LGTM 🙂

@SakiTakamachi SakiTakamachi merged commit ae505db into php:master Sep 25, 2024
10 checks passed
@SakiTakamachi SakiTakamachi deleted the ci/php84 branch September 25, 2024 13:58
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.

4 participants