Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Dec 10, 2020

⚠️ This backport had conflicts and is incomplete ⚠️ Manually cherry-picked, resolved and pushed.

backport of #23044

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

🐘

juliusknorr and others added 20 commits December 14, 2020 11:12
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
This might happen a releases that doesn't have this table yet

Signed-off-by: Julius Härtl <[email protected]>
- calendarsubscriptions.lastmodified -> not null
- external_config.value -> allow null

Signed-off-by: Vincent Petry <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
as the files are not scanned we cannot use the OCP\Files api

Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>

Revert "Make sure the migrations table schema is always checked"

This reverts commit 258955e.

Set current vendor during upgrade and perform migrations table change if needed

Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
@juliusknorr juliusknorr force-pushed the backport/23044/stable20 branch from 1d193a6 to be0936d Compare December 14, 2020 10:14
@faily-bot
Copy link

faily-bot bot commented Dec 14, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 441: failure

sqlite

Show full log
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) Test\Files\Cache\UpdaterLegacyTest::testWrite
Failed asserting that 1607941269 is equal to 1607941270 or is greater than 1607941270.

/drone/src/tests/lib/Files/Cache/UpdaterLegacyTest.php:118

@rullzer rullzer merged commit 24fe3ee into stable20 Dec 14, 2020
@rullzer rullzer deleted the backport/23044/stable20 branch December 14, 2020 14:35
@rullzer rullzer mentioned this pull request Dec 14, 2020
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.

4 participants