Skip to content

Commit ae85eab

Browse files
committed
fix: Allow installation on macOS CI
Signed-off-by: Marcel Müller <[email protected]>
1 parent bbca4fe commit ae85eab

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

core/Command/Maintenance/Install.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
5858
$errors = $sysInfo['errors'];
5959
if (count($errors) > 0) {
6060
$this->printErrors($output, $errors);
61-
62-
// ignore the OS X setup warning
63-
if (count($errors) !== 1
64-
|| (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!') {
65-
return 1;
66-
}
61+
return 1;
6762
}
6863

6964
// validate user input

lib/private/Setup.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,10 @@ public function getSystemInfo(bool $allowAllDatabases = false): array {
186186
}
187187

188188
// Check if running directly on macOS (note: Linux containers on macOS will not trigger this)
189-
if (PHP_OS_FAMILY === 'Darwin') {
189+
if (!getenv('CI') && PHP_OS_FAMILY === 'Darwin') {
190190
$errors[] = [
191191
'error' => $this->l10n->t(
192-
'macOS is not supported and %s will not work properly on this platform. '
193-
. 'Use it at your own risk!',
192+
'macOS is not supported and %s will not work properly on this platform.',
194193
[$this->defaults->getProductName()]
195194
),
196195
'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'),

0 commit comments

Comments
 (0)