Compare commits

..

No commits in common. "2" and "2.6.0-beta1" have entirely different histories.

5 changed files with 20 additions and 30 deletions

View File

@ -4,8 +4,13 @@ on:
push: push:
pull_request: pull_request:
workflow_dispatch: workflow_dispatch:
# Every Wednesday at 1:20pm UTC
schedule:
- cron: '20 13 * * 3'
jobs: jobs:
ci: ci:
name: CI name: CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

View File

@ -1,16 +0,0 @@
name: Dispatch CI
on:
# At 1:20 PM UTC, only on Wednesday and Thursday
schedule:
- cron: '20 13 * * 3,4'
jobs:
dispatch-ci:
name: Dispatch CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1

View File

@ -43,7 +43,7 @@ class SolrIndexCheck implements EnvironmentCheck
if (!empty($brokenCores)) { if (!empty($brokenCores)) {
return [ return [
EnvironmentCheck::ERROR, EnvironmentCheck::ERROR,
'The following indexes are unavailable: ' . implode(', ', $brokenCores) 'The following indexes are unavailable: ' . implode($brokenCores ?? '', ', ')
]; ];
} }

View File

@ -275,63 +275,64 @@ class EnvironmentChecker extends RequestHandler
return $this; return $this;
} }
/** /**
* @deprecated 2.0.0 Use config API instead * @deprecated
* @param string $from * @param string $from
*/ */
public static function set_from_email_address($from) public static function set_from_email_address($from)
{ {
Deprecation::notice('2.0.0', 'Use config API instead'); Deprecation::notice('2.0', 'Use config API instead');
static::config()->set('from_email_address', $from); static::config()->set('from_email_address', $from);
} }
/** /**
* @deprecated 2.0.0 Use config API instead * @deprecated
* @return null|string * @return null|string
*/ */
public static function get_from_email_address() public static function get_from_email_address()
{ {
Deprecation::notice('2.0.0', 'Use config API instead'); Deprecation::notice('2.0', 'Use config API instead');
return static::config()->get('from_email_address'); return static::config()->get('from_email_address');
} }
/** /**
* @deprecated 2.0.0 Use config API instead * @deprecated
* @param string $to * @param string $to
*/ */
public static function set_to_email_address($to) public static function set_to_email_address($to)
{ {
Deprecation::notice('2.0.0', 'Use config API instead'); Deprecation::notice('2.0', 'Use config API instead');
static::config()->set('to_email_address', $to); static::config()->set('to_email_address', $to);
} }
/** /**
* @deprecated 2.0.0 Use config API instead * @deprecated
* @return null|string * @return null|string
*/ */
public static function get_to_email_address() public static function get_to_email_address()
{ {
Deprecation::notice('2.0.0', 'Use config API instead'); Deprecation::notice('2.0', 'Use config API instead');
return static::config()->get('to_email_address'); return static::config()->get('to_email_address');
} }
/** /**
* @deprecated 2.0.0 Use config API instead * @deprecated
* @param bool $results * @param bool $results
*/ */
public static function set_email_results($results) public static function set_email_results($results)
{ {
Deprecation::notice('2.0.0', 'Use config API instead'); Deprecation::notice('2.0', 'Use config API instead');
static::config()->set('email_results', $results); static::config()->set('email_results', $results);
} }
/** /**
* @deprecated 2.0.0 Use config API instead * @deprecated
* @return bool * @return bool
*/ */
public static function get_email_results() public static function get_email_results()
{ {
Deprecation::notice('2.0.0', 'Use config API instead'); Deprecation::notice('2.0', 'Use config API instead');
return static::config()->get('email_results'); return static::config()->get('email_results');
} }
} }