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

[master] Update psalm-baseline.xml #40725

Merged
merged 4 commits into from
Feb 5, 2024

Conversation

nextcloud-command
Copy link
Contributor

Auto-generated update psalm-baseline.xml with fixed psalm warnings

@nextcloud-command nextcloud-command requested review from a team, ArtificialOwl, icewind1991 and Fenn-CS and removed request for a team September 30, 2023 02:50
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch 3 times, most recently from 0c00854 to 85f431f Compare October 8, 2023 02:22
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch 2 times, most recently from e17e67d to e2c889d Compare October 15, 2023 02:22
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch 2 times, most recently from 15ccf1c to 8eead1a Compare October 22, 2023 02:22
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch 4 times, most recently from f7fdc7e to 0732a4c Compare November 1, 2023 02:40
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch from 0732a4c to f038819 Compare November 5, 2023 02:20
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch 2 times, most recently from 75c69f2 to f20b304 Compare November 16, 2023 02:22
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch 2 times, most recently from 2296d04 to dbb07dc Compare November 21, 2023 02:24
@solracsf solracsf added this to the Nextcloud 28 milestone Nov 21, 2023
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch from dbb07dc to 94c4e7d Compare November 22, 2023 02:25
@blizzz blizzz mentioned this pull request Nov 22, 2023
5 tasks
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch from 94c4e7d to cb636b8 Compare November 25, 2023 02:23
@come-nc come-nc force-pushed the automated/noid/master-update-psalm-baseline branch from 94dfff2 to dfc33b9 Compare February 1, 2024 16:16
@come-nc
Copy link
Contributor

come-nc commented Feb 1, 2024

Rebased, updated baseline and attempted to fix baseline updating workflow.

The baseline I pushed is full of CDATA because of vimeo/psalm#10632
It should not be a problem, let’s see what CI thinks of it.

@nickvergessen
Copy link
Member

While on it, can we enforce the correct PHP version as baseline: https://github.com/nextcloud/spreed/blob/main/psalm.xml#L8
Otherwise you can use PHP 8.2 functions and psalm will not complain :P

@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch from dfc33b9 to 3543751 Compare February 3, 2024 02:37
@nextcloud-command nextcloud-command requested a review from a team February 3, 2024 02:37
@nextcloud-command nextcloud-command force-pushed the automated/noid/master-update-psalm-baseline branch from 3543751 to e963f37 Compare February 5, 2024 02:22
@nickvergessen nickvergessen self-requested a review February 5, 2024 08:33
@come-nc come-nc force-pushed the automated/noid/master-update-psalm-baseline branch from e963f37 to dfc33b9 Compare February 5, 2024 08:44
@come-nc
Copy link
Contributor

come-nc commented Feb 5, 2024

While on it, can we enforce the correct PHP version as baseline: nextcloud/spreed@main/psalm.xml#L8 Otherwise you can use PHP 8.2 functions and psalm will not complain :P

The psalm jobs already run on 8.0, and our composer.json lists 8.0 as php platform, should be enough, no?

@come-nc come-nc force-pushed the automated/noid/master-update-psalm-baseline branch from dfc33b9 to 0a1fab0 Compare February 5, 2024 09:53
@come-nc come-nc force-pushed the automated/noid/master-update-psalm-baseline branch from 0a1fab0 to 40ab40d Compare February 5, 2024 10:15
@nickvergessen nickvergessen merged commit 35bc99d into master Feb 5, 2024
144 checks passed
@nickvergessen nickvergessen deleted the automated/noid/master-update-psalm-baseline branch February 5, 2024 13:09
@come-nc
Copy link
Contributor

come-nc commented Feb 6, 2024

/backport 40ab40de30ee90ded277065da206aa3830a2f796to stable28

@come-nc
Copy link
Contributor

come-nc commented Feb 6, 2024

/backport 40ab40d to stable28

Copy link

backportbot bot commented Feb 6, 2024

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b backport/40725/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 40ab40de

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/40725/stable28

Error: Failed to push branch backport/40725/stable28: To https://github.com/nextcloud/server.git
! [remote rejected] backport/40725/stable28 -> backport/40725/stable28 (refusing to allow a GitHub App to create or update workflow .github/workflows/update-psalm-baseline.yml without workflows permission)
error: failed to push some refs to 'https://github.com/nextcloud/server.git'


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants