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

Merged
merged 23 commits into from
Oct 9, 2024
Merged

[stable28] Ci fixes #48213

merged 23 commits into from
Oct 9, 2024

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 force-pushed the backport/48205/stable28 branch from c18d146 to c255e70 Compare September 19, 2024 16:11
@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 icewind1991 force-pushed the backport/48205/stable28 branch from 0fdf940 to 2777947 Compare September 19, 2024 19:42
@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
@artonge artonge force-pushed the backport/48205/stable28 branch from 1888cb7 to 49bbed6 Compare October 1, 2024 20:21
@Altahrim Altahrim force-pushed the backport/48205/stable28 branch from 49bbed6 to ead4873 Compare October 2, 2024 07:23
@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 force-pushed the backport/48205/stable28 branch from b8e9d3f to 09b9f2f Compare October 4, 2024 14:30
@icewind1991 icewind1991 mentioned this pull request Oct 4, 2024
Merged
@artonge
fix: Drop unnecessary exit
3c7bb63 
Signed-off-by: Louis Chemineau <louis@chmn.me>
icewind1991 and others added 22 commits October 8, 2024 18:14
@icewind1991 @artonge
fix: get source file before moving the cache item in objectstore move…
fe8ac42 
…FromStorage

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
fix: create intermediate directories for objectstore moveFromStorage
e794d04 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
fix: cleanup objectstore file_put_content
e0f7dec 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
fix: fix object store id for test object store
0dacf09 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
fix: verify that parent exists in cache when inserting
78637be 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
test: fix incorrect ltrim usage in test
f1df40f 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
fix: ensure parent folder exists when writing a file to object storage
6421581 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
test: put parent items into cache in tests
b8464ef 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
test: fix service overwrite in PartFileInRootUploadTest
717b303 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
test: fix ShareAPIControllerTest.php
1df9f6e 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
test: fix trashbin StorageTest
5b7c43f 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
test: fix ShareControllerTest.php
d3f2e39 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@artonge
fix: Override start method of \Sabre\DAV\Server to remove exception o…
835e14e 
…utput

Signed-off-by: Louis Chemineau <louis@chmn.me>
@come-nc @artonge
fix(tests): Fix Folder tests
ec0ff3d 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@artonge
fix: Prevent duplicate creation of print_exception function
0d543d1 
Signed-off-by: Louis Chemineau <louis@chmn.me>
@icewind1991 @artonge
fix: fix shared storage test
1eb9351 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
fix: fix trashbin move with object store
5cbd4c0 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
fix: ensure source folder is removed from cache when moving to object…
5d36da3 
…store

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

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
fix: preserve fileid when moving from objectstore to non-objectstore
99d62bf 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 @artonge
fix: rework move into object store to better preserve fileids
49a756b 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@artonge
fix(tests): UserManager constructor arguments
2a27a41 
After #48283

Signed-off-by: Louis Chemineau <louis@chmn.me>
@icewind1991 @artonge
fix: improve moving object store items to trashbin
821ce4d 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@artonge artonge force-pushed the backport/48205/stable28 branch from 09b9f2f to 821ce4d Compare October 8, 2024 16:14
@sorbaugh sorbaugh merged commit b97a88a into stable28 Oct 9, 2024
55 of 56 checks passed
@sorbaugh sorbaugh deleted the backport/48205/stable28 branch October 9, 2024 15:33
@blizzz blizzz mentioned this pull request Oct 10, 2024
Merged
@danxuliu danxuliu mentioned this pull request Oct 31, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv approved these changes

@artonge artonge artonge approved these changes

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

@icewind1991 icewind1991 Awaiting requested review from icewind1991

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.
5 participants
@icewind1991 @artonge @skjnldsv @sorbaugh @come-nc