mirror of
https://github.com/nextcloud/server.git
synced 2026-06-14 19:20:35 -04:00
fix: Allow installation on macOS CI
Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
This commit is contained in:
parent
bbca4fe56e
commit
ae85eab73c
2 changed files with 3 additions and 9 deletions
|
|
@ -58,12 +58,7 @@ class Install extends Command {
|
|||
$errors = $sysInfo['errors'];
|
||||
if (count($errors) > 0) {
|
||||
$this->printErrors($output, $errors);
|
||||
|
||||
// ignore the OS X setup warning
|
||||
if (count($errors) !== 1
|
||||
|| (string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk!') {
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
// validate user input
|
||||
|
|
|
|||
|
|
@ -186,11 +186,10 @@ class Setup {
|
|||
}
|
||||
|
||||
// Check if running directly on macOS (note: Linux containers on macOS will not trigger this)
|
||||
if (PHP_OS_FAMILY === 'Darwin') {
|
||||
if (!getenv('CI') && PHP_OS_FAMILY === 'Darwin') {
|
||||
$errors[] = [
|
||||
'error' => $this->l10n->t(
|
||||
'macOS is not supported and %s will not work properly on this platform. '
|
||||
. 'Use it at your own risk!',
|
||||
'macOS is not supported and %s will not work properly on this platform.',
|
||||
[$this->defaults->getProductName()]
|
||||
),
|
||||
'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'),
|
||||
|
|
|
|||
Loading…
Reference in a new issue