diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 0000000..ff51ff1 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 1:10 PM UTC, only on Tuesday + schedule: + - cron: '10 13 * * 2' + 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 8794670..4be1c5a 100644 --- a/license.md +++ 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 c5349e2..7188325 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "silverstripe/framework": "^5" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3", "silverstripe/versioned": "^2" }, @@ -36,4 +36,4 @@ "extra": [], "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +}