diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index af4d7688..a287bf50 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,10 +1,10 @@ name: Keepalive on: - workflow_dispatch: - # The 23rd of every month at 3:50pm UTC + # At 11:55 AM UTC, on day 24 of the month schedule: - - cron: '50 15 23 * *' + - cron: '55 11 24 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 00000000..7fc325be --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 3:10 PM UTC, only on Thursday + schedule: + - cron: '10 15 * * 4' + 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 525b86de..02a1097e 100644 --- a/LICENSE.md +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016, SilverStripe Ltd. +Copyright (c) 2016, Silverstripe Ltd. All rights reserved. Redistribution and use in source and binary forms, with or without