From 096127ccdbbcd358970032d08b3b40412dc94b8d Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 9 Aug 2023 15:00:28 +1200 Subject: [PATCH] MNT Run module-standardiser --- .github/workflows/merge-up.yml | 17 +++++++++++++++++ LICENSE.md => LICENSE | 2 +- composer.json | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/merge-up.yml rename LICENSE.md => LICENSE (97%) diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 0000000..3bfedd4 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 12:10 PM UTC, only on Sunday + schedule: + - cron: '10 12 * * 0' + 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.md b/LICENSE similarity index 97% rename from LICENSE.md rename to LICENSE index c2ccddf..d7d2650 100644 --- a/LICENSE.md +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017, SilverStripe Ltd +Copyright (c) 2017, Silverstripe Ltd All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/composer.json b/composer.json index 90c66a9..e3744ba 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "ext-curl": "*", "ext-tidy": "*", "ext-zip": "*", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3" }, "autoload": {