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

Use own psalm instead of a global one #23401

Merged
merged 2 commits into from
Oct 13, 2020
Merged

Conversation

ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Oct 13, 2020

Our CI used a global psalm and not one we install via composer. Hence this is waiting for random CI failure when the one in the docker image updates. We should have control over the version and use Dependabot for updates to make the manageable.

composer.json Outdated
@@ -17,11 +17,12 @@
},
"require-dev": {
"nextcloud/coding-standard": "^0.3.0",
"psalm/phar": "^3.12"
"vimeo/psalm": "^3.17"
Copy link
Contributor

@kesselb kesselb Oct 13, 2020

Choose a reason for hiding this comment

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

An advantage of the phar version is less troubles with dependencies (in lib/composer)

Copy link
Member Author

Choose a reason for hiding this comment

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

It is indeed. But so far there are no conflicts so I'd use the "real" one as long as possible 😉

Copy link
Contributor

Choose a reason for hiding this comment

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

Good ;) We install a lot of dependencies (like symfony/console) which are already part of 3rdparty. But lib/composer is ignored so this should work.

I would suggest to migrate the composer dev-dependencies to phive (https://phar.io/) at some point. That's more convenient to setup.

@MorrisJobke
Copy link
Member

Both are merged ✅

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst ChristophWurst force-pushed the techdebt/psalm-no-global branch from bcd8a91 to 081e9ac Compare October 13, 2020 15:55
@faily-bot
Copy link

faily-bot bot commented Oct 13, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 34094: failure

mysql8.0-php7.4

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke MorrisJobke merged commit 78a0449 into master Oct 13, 2020
@MorrisJobke MorrisJobke deleted the techdebt/psalm-no-global branch October 13, 2020 21:34
@MorrisJobke
Copy link
Member

Backport to stable20? It started failing in https://github.com/nextcloud/server/pull/23466/checks?check_run_id=1258325103 😢

@MorrisJobke
Copy link
Member

I'm also fine with adding more stuff to the baseline in stable20, but it should not fail.

@MorrisJobke
Copy link
Member

/backport to stable20

@ChristophWurst
Copy link
Member Author

/backport to stable20

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.

3 participants