-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Try to delete the cypress folder of the viewer app #16288
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.
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
Conversation
|
As proposed by @jospoortvliet |
|
/backport to stable16 |
|
I tested this on Nextcloud 16.0.2 and ran the |
| /** @var Checker $checker */ | ||
| private $checker; | ||
|
|
||
| private $pathToViewerApp = __DIR__ . '/../../../../apps/viewer'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't we get it from the app manager? in case it was moved?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do a file_exists anyways and it should only matter if the app was installed via the release package and not updated via appstore. So this is just the easiest way without the problem of dealing with multiple app directories.
|
I would prefer |
| } | ||
|
|
||
| public function run(IOutput $output): void { | ||
| $file = $this->pathToViewerApp . '/cypress.json'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
server/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
Lines 91 to 103 in 11a27b2
| private function shouldRun(): bool { | |
| return version_compare( | |
| $this->config->getSystemValue('version', '0.0.0.0'), | |
| '16.0.0.0', | |
| '<=' | |
| ); | |
| } | |
| public function run(IOutput $output): void { | |
| if ($this->shouldRun()) { | |
| $this->repair($output); | |
| } | |
| } |
I guess you want to release it today? You could add something like this if there is some time left.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was there and the check for the actual outcome is far better IMO than the "lets assume some version number and check for that". And here the check for the outcome was pretty straight forward so I reduced the code to be better readable by just put it where it is checked.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm okay with that. Would it make sense to mark this as deprecated to remove it in the future?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me add this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In general that was also the idea of putting those repair steps in the NC16 folder for example. Because you know when they were added.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also did some cleanup in #16292
|
I think this should actually not be required. From a look at the updater code it seems that it only deletes files from apps listed in shipped.json. For viewer that was not the case in 16.0.1 which is why the update to 16.0.2 doesn't delete those files. (See https://github.com/nextcloud/server/pull/15592/files) This means that if you have installed the RC of 16.0.2 and update to 16.0.2 the error will be gone, which might explain that some of us could not reproduce the issue with the release. But I'm also fine to have this in, just to be sure 😉 |
|
Makes of course still sense to have this cleanup job, in case someone goes from 16.0.1 to 16.0.3 then 👍 |
The argument by @jospoortvliet was that we should try to fix this proactive instead of assuming that it will resolve in the future by itself. ;) And as this is straight forward I'm fine with the proactive repair step. |
ddd71d5 to
d1e4e7d
Compare
Done ✅ |
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
d1e4e7d to
13c7810
Compare
|
thanks, good work 👍 |
|
backport to stable16 in #16297 |
Fixes #16229