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

[stable28] Ci fixes #48213

Open
wants to merge 23 commits into
base: stable28
Choose a base branch
from
Open

[stable28] Ci fixes #48213

wants to merge 23 commits into from

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Sep 19, 2024 •
edited by artonge
Loading

Backport of #48205

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.

@backportbot backportbot bot added bug 3. to review Waiting for reviews php Pull requests that update Php code CI labels Sep 19, 2024
@backportbot backportbot bot added this to the Nextcloud 28.0.11 milestone Sep 19, 2024
@artonge artonge changed the title [stable28] [stable30] Ci fixes [stable28] Ci fixes Sep 19, 2024
@icewind1991 icewind1991 mentioned this pull request Sep 19, 2024
Closed
@icewind1991 icewind1991 marked this pull request as ready for review September 19, 2024 19:40
@icewind1991
Copy link
Member

had to include a variation of #48224 here: 774227d

This was referenced Sep 20, 2024
Closed
Closed
@icewind1991 icewind1991 mentioned this pull request Oct 1, 2024
Merged
@icewind1991
Copy link
Member

Added #48235

@Altahrim Altahrim mentioned this pull request Oct 1, 2024
Merged
2 tasks
icewind1991 and others added 16 commits October 2, 2024 09:23
@icewind1991 @Altahrim
test: fix incorrect ltrim usage in test
c099f2f 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
fix: ensure parent folder exists when writing a file to object storage
2b25af2 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
test: put parent items into cache in tests
0b158e5 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
test: fix service overwrite in PartFileInRootUploadTest
a1ffe74 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
test: fix ShareAPIControllerTest.php
c71c3ea 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
test: fix trashbin StorageTest
97809c2 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
test: fix ShareControllerTest.php
cfadb4a 
Signed-off-by: Robin Appelman <[email protected]>
@artonge @Altahrim
fix: Override start method of \Sabre\DAV\Server to remove exception o…
8afccb8 
…utput

Signed-off-by: Louis Chemineau <[email protected]>
@come-nc @Altahrim
fix(tests): Fix Folder tests
d728c1d 
Signed-off-by: Côme Chilliet <[email protected]>
@artonge @Altahrim
fix: Prevent duplicate creation of print_exception function
b65cef1 
Signed-off-by: Louis Chemineau <[email protected]>
@icewind1991 @Altahrim
fix: fix shared storage test
c8d4b0a 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
fix: fix trashbin move with object store
002a980 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
fix: ensure source folder is removed from cache when moving to object…
dfeca3e 
…store

otherwise this causes confusion down the line as it's contents will be moved to the new cache

Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
fix: preserve fileid when moving from objectstore to non-objectstore
4b1759c 
Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 @Altahrim
fix: rework move into object store to better preserve fileids
c915c07 
Signed-off-by: Robin Appelman <[email protected]>
@artonge @Altahrim
fix(tests): UserManager constructor arguments
ead4873 
After #48283

Signed-off-by: Louis Chemineau <[email protected]>
@artonge
Copy link
Contributor

artonge commented Oct 2, 2024

Two remaining errors:

There were 2 failures:

1) OCA\Files_Trashbin\Tests\StorageTest::testCrossStorageDeleteFile
Failed asserting that 0 matches expected 1.

/home/runner/actions-runner/_work/server/server/apps/files_trashbin/tests/StorageTest.php:232

2) OCA\Files_Trashbin\Tests\StorageTest::testCrossStorageDeleteFolder
Failed asserting that 0 matches expected 1.

/home/runner/actions-runner/_work/server/server/apps/files_trashbin/tests/StorageTest.php:259

@icewind1991 is this from your changes, or shall we find someone else?

@icewind1991 icewind1991 mentioned this pull request Oct 4, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artonge artonge artonge approved these changes

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

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

@icewind1991 icewind1991 Awaiting requested review from icewind1991

At least 2 approving reviews are required to merge this pull request.

Assignees

@icewind1991 icewind1991

Labels
3. to review Waiting for reviews bug CI php Pull requests that update Php code
Projects
None yet
Milestone
Nextcloud 28.0.11
Development

Successfully merging this pull request may close these issues.
3 participants
@icewind1991 @artonge @come-nc