sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56900 from nextcloud/fix/noid/allow-macos-on-ci 

fix: Allow installation on macOS CI
pull/55915/merge
Joas Schilling 2025-12-10 11:39:21 +07:00 committed by GitHub
parent f3c56f051a ae85eab73c
commit da1dd481e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/Command/Maintenance/Install.php
Unescape Escape View File

@ -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

5
lib/private/Setup.php
Unescape Escape View File

@ -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.'),