From 6dfb322d05215dbad8f324fe52c8f5dabdc8a6f5 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 29 Aug 2023 15:17:34 +1200 Subject: [PATCH] MNT Run module-standardiser --- .github/workflows/keepalive.yml | 6 +++--- .github/workflows/merge-up.yml | 17 +++++++++++++++++ .github/workflows/update-js.yml | 2 +- license.md => LICENSE | 2 +- composer.json | 4 ++-- 5 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/merge-up.yml rename license.md => LICENSE (97%) diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 4cf5fbb..5b63b26 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,10 +1,10 @@ name: Keepalive on: - workflow_dispatch: - # The 4th of every month at 10:50am UTC + # At 9:45 PM UTC, on day 26 of the month schedule: - - cron: '50 10 4 * *' + - cron: '45 21 26 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 0000000..7fc05f4 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 12:00 PM UTC, only on Wednesday + schedule: + - cron: '0 12 * * 3' + workflow_dispatch: + +jobs: + merge-up: + name: Merge-up + # 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: Merge-up + uses: silverstripe/gha-merge-up@v1 diff --git a/.github/workflows/update-js.yml b/.github/workflows/update-js.yml index 0f44712..32acca6 100644 --- a/.github/workflows/update-js.yml +++ b/.github/workflows/update-js.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: # Run on a schedule of once per quarter schedule: - - cron: '0 0 1 */3 *' + - cron: '45 21 1 */3 *' jobs: update-js: diff --git a/license.md b/LICENSE similarity index 97% rename from license.md rename to LICENSE index 9445c8e..acbaea1 100644 --- a/license.md +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016, SilverStripe Limited +Copyright (c) 2016, Silverstripe Limited All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/composer.json b/composer.json index 0f8d25d..676319e 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "silverstripe/versioned": "^2" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3" }, "autoload": { @@ -40,4 +40,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +}