Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Mar 26, 2025

Backport of #50244

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits
  • Amend HEAD commit to remove the line stating to skip CI

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

Copy link
Member

@AndyScherzinger AndyScherzinger left a comment

Choose a reason for hiding this comment

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

🐘

@AndyScherzinger AndyScherzinger force-pushed the backport/50244/stable31 branch 2 times, most recently from e4817a5 to 243d942 Compare April 3, 2025 11:16
@AndyScherzinger AndyScherzinger force-pushed the backport/50244/stable31 branch from 243d942 to 9f96d08 Compare April 23, 2025 22:08
@nfebe nfebe marked this pull request as ready for review April 23, 2025 22:17
@nfebe nfebe enabled auto-merge April 23, 2025 22:17
@AndyScherzinger AndyScherzinger force-pushed the backport/50244/stable31 branch 2 times, most recently from 0fd12e5 to f1cd460 Compare April 24, 2025 05:24
@nfebe nfebe force-pushed the backport/50244/stable31 branch 2 times, most recently from da9ba28 to f4c2ae0 Compare April 24, 2025 09:30
@AndyScherzinger AndyScherzinger force-pushed the backport/50244/stable31 branch 5 times, most recently from 5516b14 to 88843f0 Compare April 27, 2025 20:57
@provokateurin
Copy link
Member

With the amount of failing CI I think we need to look into this properly. I'll try to make a manual backport of the original PR to see if that helps.

@provokateurin provokateurin marked this pull request as draft April 28, 2025 05:54
auto-merge was automatically disabled April 28, 2025 05:54

Pull request was converted to draft

Pytal added 6 commits April 28, 2025 09:10
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@provokateurin provokateurin force-pushed the backport/50244/stable31 branch from 88843f0 to 338da85 Compare April 28, 2025 07:12
@provokateurin
Copy link
Member

provokateurin commented Apr 28, 2025

The source was probably the invalid PHP syntax 🤦‍♀️ https://github.com/nextcloud/server/actions/runs/14696045456/job/41237799482?pr=51736
And seeing the diff from my changes it seems like the rest of the backport was not done correctly either as most changes were actually missing.

@provokateurin provokateurin marked this pull request as ready for review April 28, 2025 07:12
@provokateurin provokateurin enabled auto-merge April 28, 2025 07:12
@provokateurin provokateurin merged commit 96a12e7 into stable31 Apr 28, 2025
220 of 234 checks passed
@provokateurin provokateurin deleted the backport/50244/stable31 branch April 28, 2025 08:20
@provokateurin
Copy link
Member

🎉

@blizzz blizzz mentioned this pull request May 5, 2025
10 tasks
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.

7 participants