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.

Sign up for GitHub

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

Jump to bottom

[stable23] Fix psalm not running #30814

Merged
merged 1 commit into from Jan 27, 2022
Merged

[stable23] Fix psalm not running #30814

merged 1 commit into from Jan 27, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Jan 22, 2022 •
edited by CarlSchwan

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #30508

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 23.0.1 milestone Jan 22, 2022
@MichaIng MichaIng added the 2. developing Work in progress label Jan 22, 2022
@skjnldsv
Copy link
Member

@CarlSchwan can you have a look? :)

@CarlSchwan
Copy link
Member

This needs a composer psalm -- --set-baseline=build/psalm-baseline.xml to make the baseline up to date

I will try to do it tonight unless someone beat me to it before ;)

@CarlSchwan CarlSchwan force-pushed the backport/30508/stable23 branch 2 times, most recently from e6001f7 to c60321f Compare January 22, 2022 19:48
@CarlSchwan
Copy link
Member

I hope the tests will pass now :)

@skjnldsv
Copy link
Member

Same for stable22 :)
#30508 (comment)

@CarlSchwan
Copy link
Member

@skjnldsv This PR should be good now :) The issue with 'Code scanning results / Psalm' is that it is comparing with stable23 and as we updated the psalm dependency the comparison fails. This will fix itself automatically once merged, as new PR will compare against the new baseline.

@CarlSchwan
Copy link
Member

/me forgot to run cs:fixer 😭

@CarlSchwan CarlSchwan force-pushed the backport/30508/stable23 branch 2 times, most recently from a9abdb7 to 283b4cf Compare January 24, 2022 11:52
@MichaIng MichaIng added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jan 25, 2022
@skjnldsv skjnldsv mentioned this pull request Jan 25, 2022
Merged
3 tasks
@CarlSchwan CarlSchwan force-pushed the backport/30508/stable23 branch 2 times, most recently from 6a6f469 to f43fcd2 Compare January 26, 2022 11:18
@skjnldsv
Copy link
Member

Please edit the checker :)

ERROR: There were 2 additional files:
223 | .php-cs-fixer.dist.php
224 | vendor-bin
225 | ERROR: There were 1 missing files:
226 | .php_cs.dist

@CarlSchwan
Fix psalm not running
d69531a 
The issue was that we were using psalm/phar instead of vimeo/psalm. This
caused issue with the custom psalm plugin in buildd/psalm.

This is using the opportunity to also update the psalm version from 3.8
to 3.17 and the php-cs-fixer too.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 27, 2022
@skjnldsv skjnldsv merged commit 3ee9bcc into stable23 Jan 27, 2022
@skjnldsv skjnldsv deleted the backport/30508/stable23 branch January 27, 2022 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv approved these changes

@MichaIng MichaIng MichaIng approved these changes

@CarlSchwan CarlSchwan Awaiting requested review from CarlSchwan

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@come-nc come-nc Awaiting requested review from come-nc

@juliushaertl juliushaertl Awaiting requested review from juliushaertl

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Milestone
Nextcloud 23.0.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@skjnldsv @CarlSchwan @MichaIng