From 504dfcd919ee9be8d2410ca95166702653011b3f Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 29 Aug 2023 15:15:42 +1200 Subject: [PATCH] MNT Run module-standardiser --- .github/workflows/keepalive.yml | 6 +++--- .github/workflows/merge-up.yml | 17 +++++++++++++++++ LICENSE | 2 +- composer.json | 4 ++-- 4 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/merge-up.yml diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 4cf5fbb2..f9d55ec6 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 6:30 PM UTC, on day 7 of the month schedule: - - cron: '50 10 4 * *' + - cron: '30 18 7 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 00000000..567cb4e6 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 11:00 AM UTC, only on Friday + schedule: + - cron: '0 11 * * 5' + 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/LICENSE b/LICENSE index 87946707..4be1c5a7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017, SilverStripe Limited +Copyright (c) 2017, 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 3776733c..b98c11b3 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "silverstripe/vendor-plugin": "^2" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3.7" }, "extra": { @@ -45,4 +45,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +}