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

chore: Fix update-psalm-baseline to use correct php version depending on branch #44861

Merged
merged 1 commit into from
Apr 22, 2024

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Apr 16, 2024

Summary

The workflow currently always use 8.1, it should use the same PHP version as the psalm run on the target branch.
Adding the PHP version to psalm.xml so that the update-baseline workflow is aware of it. Backports will need to adapt the PHP version to the one used in their psalm workflow (the lowest PHP version supported usually).

Checklist

@come-nc come-nc self-assigned this Apr 16, 2024
@come-nc come-nc changed the title chore: Fix update-psalm-baseline to use correct php version depending… chore: Fix update-psalm-baseline to use correct php version depending on branch Apr 16, 2024
@come-nc come-nc added the CI label Apr 16, 2024
@come-nc come-nc requested review from nickvergessen and susnux April 16, 2024 15:59
@nickvergessen
Copy link
Member

Should add it like in apps, e.g. https://github.com/nextcloud/spreed/blob/main/psalm.xml#L8
So it locally also always runs with the expected php version

@susnux susnux added this to the Nextcloud 30 milestone Apr 18, 2024
@come-nc come-nc force-pushed the fix/fix-update-baseline-php-version branch from 1babaa7 to f6a443f Compare April 22, 2024 08:45
Needs to be adapted on each branch to reflect the used PHP version and
 help with baseline updating.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the fix/fix-update-baseline-php-version branch from f6a443f to 9092dcf Compare April 22, 2024 08:46
@come-nc
Copy link
Contributor Author

come-nc commented Apr 22, 2024

Should add it like in apps, e.g. https://github.com/nextcloud/spreed/blob/main/psalm.xml#L8 So it locally also always runs with the expected php version

Ok, trying this way then, putting 8.1 in master and will change to 8.0 in the backports.

@come-nc
Copy link
Contributor Author

come-nc commented Apr 22, 2024

/backport to stable29

@come-nc come-nc requested review from provokateurin, a team, ArtificialOwl, yemkareems and sorbaugh and removed request for a team April 22, 2024 09:09
@nickvergessen
Copy link
Member

Backporting is not going to work, 29 and lower need 8.0 at least.
So let's save 2 CI cycles by backporting it after 29 was fixed...

@nextcloud nextcloud deleted a comment from come-nc Apr 22, 2024
@nextcloud nextcloud deleted a comment from come-nc Apr 22, 2024
@nickvergessen nickvergessen enabled auto-merge April 22, 2024 09:15
@nickvergessen nickvergessen merged commit 0f63eb2 into master Apr 22, 2024
104 checks passed
@nickvergessen nickvergessen deleted the fix/fix-update-baseline-php-version branch April 22, 2024 09:17
@blizzz blizzz mentioned this pull request Jul 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants