Skip to content

[stable26] fix semaphore unguarding - #41290

Merged
szaimen merged 1 commit into
stable26from
backport/41263/stable26
Jan 15, 2024
Merged

[stable26] fix semaphore unguarding#41290
szaimen merged 1 commit into
stable26from
backport/41263/stable26

Conversation

@szaimen

@szaimenszaimen commented Nov 5, 2023

Copy link
Copy Markdown
Contributor

Manual backport of #41263 to stable26

@szaimenszaimen added bug 3. to review Waiting for reviews labels Nov 5, 2023
@szaimenszaimen added this to the Nextcloud 26.0.9 milestone Nov 5, 2023
@szaimenszaimen mentioned this pull request Nov 5, 2023
Merged
github-advanced-security[bot]
github-advanced-securityAI found potential problems Nov 5, 2023
View reviewed changes
Comment threadlib/private/Preview/Generator.php Fixed
@szaimen

szaimen commented Nov 5, 2023

Copy link
Copy Markdown
ContributorAuthor

Needs an update to the baseline

@szaimenszaimen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Nov 5, 2023
@szaimen
szaimen marked this pull request as draft November 5, 2023 17:56
@blizzzblizzz mentioned this pull request Nov 13, 2023
Merged
@blizzz

blizzz commented Nov 16, 2023

Copy link
Copy Markdown
Member

moving to 26.0.10

@blizzzblizzz mentioned this pull request Dec 4, 2023
Merged
@blizzz

blizzz commented Dec 7, 2023

Copy link
Copy Markdown
Member

moving to 26.0.11

@kesselb
kesselb removed their request for review December 7, 2023 15:37
tcitworld
tcitworld approved these changes Jan 3, 2024
View reviewed changes

@tcitworldtcitworld left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Seems to have fixed php-fpm hanging for me.

@tcitworldtcitworld added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jan 3, 2024
@blizzz

blizzz commented Jan 11, 2024

Copy link
Copy Markdown
Member

It's still in draft state. @szaimen ?

@szaimen

szaimen commented Jan 11, 2024

Copy link
Copy Markdown
ContributorAuthor

It's still in draft state. @szaimen ?

Yes, see #41290 (comment)

@blizzz

blizzz commented Jan 12, 2024

Copy link
Copy Markdown
Member

Are you waiting for an auto-update?

@szaimen

szaimen commented Jan 12, 2024•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Are you waiting for an auto-update?

If you would update the psalm baseline, I would be greatful! 😉

But actually no customer has requested this backport afaik which is the main reason I didnt work on completing it yet...

@szaimen
szaimenforce-pushed the backport/41263/stable26 branch from 4b16a7c to 4cfad11CompareJanuary 12, 2024 09:03
@blizzz

blizzz commented Jan 12, 2024

Copy link
Copy Markdown
Member

It's still in draft state. @szaimen ?

Yes, see #41290 (comment)

Actually … the results looks wrong. It's as if github runs it with PHP 7 (but why). This is not our psalm result.

@DanScharon

DanScharon commented Jan 12, 2024

Copy link
Copy Markdown

But actually no customer has requested this backport afaik which is the main reason I didnt work on completing it yet...

We haven't yet, because we saw there is this open pr scheduled for a release. But if necessary we would open an issue via portal.nextcloud.com 😄

@szaimen

szaimen commented Jan 12, 2024

Copy link
Copy Markdown
ContributorAuthor

So I tried to update the baseline but it seems like updating that is failing. See https://github.com/nextcloud/server/actions/runs/7502981657/job/20426751313. @blizzz any idea how to proceed with this PR?

@blizzzblizzz mentioned this pull request Jan 15, 2024
Merged
@szaimen
fix semaphore unguarding
c088709
Signed-off-by: Simon L <szaimen@e.mail.de>
@szaimen

szaimen commented Jan 15, 2024

Copy link
Copy Markdown
ContributorAuthor

Seems to work. Thanks a lot for the help @come-nc ! :)

@szaimen
szaimenforce-pushed the backport/41263/stable26 branch from 21139a1 to c088709CompareJanuary 15, 2024 11:08
@szaimen
szaimen marked this pull request as ready for review January 15, 2024 11:09
@szaimen
szaimen enabled auto-merge January 15, 2024 11:09
@szaimen
szaimen requested a review from blizzzJanuary 15, 2024 11:22
@szaimen

szaimen commented Jan 15, 2024

Copy link
Copy Markdown
ContributorAuthor

CI failure unrelated

@szaimen
szaimen disabled auto-merge January 15, 2024 16:37
@szaimen
szaimen merged commit 3d6b97c into stable26Jan 15, 2024
@szaimen
szaimen deleted the backport/41263/stable26 branch January 15, 2024 16:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tcitworldtcitworldtcitworld approved these changes
@come-nccome-nccome-nc approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@solracsfsolracsfAwaiting requested review from solracsf
@kesselbkesselbAwaiting requested review from kesselb
@blizzzblizzzAwaiting requested review from blizzz

Assignees

@szaimenszaimen

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 26.0.11

Development

Successfully merging this pull request may close these issues.

6 participants

@szaimen@blizzz@DanScharon@tcitworld@github-advanced-security@come-nc