mirror of
https://github.com/silverstripe/silverstripe-iframe
synced 2024-10-22 11:05:51 +02:00
Merge pull request #75 from creative-commoners/pulls/3.0/module-standardiser-1693278763
MNT Run module-standardiser
This commit is contained in:
commit
a58508370f
6
.github/workflows/keepalive.yml
vendored
6
.github/workflows/keepalive.yml
vendored
@ -1,10 +1,10 @@
|
|||||||
name: Keepalive
|
name: Keepalive
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
# At 9:45 AM UTC, on day 6 of the month
|
||||||
# The 4th of every month at 10:50am UTC
|
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '50 10 4 * *'
|
- cron: '45 9 6 * *'
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
keepalive:
|
keepalive:
|
||||||
|
17
.github/workflows/merge-up.yml
vendored
Normal file
17
.github/workflows/merge-up.yml
vendored
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
name: Merge-up
|
||||||
|
|
||||||
|
on:
|
||||||
|
# At 11:20 AM UTC, only on Monday
|
||||||
|
schedule:
|
||||||
|
- cron: '20 11 * * 1'
|
||||||
|
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
|
@ -1,4 +1,4 @@
|
|||||||
Copyright (c) 2019, SilverStripe Limited
|
Copyright (c) 2019, Silverstripe Limited
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
@ -17,7 +17,7 @@
|
|||||||
"silverstripe/cms": "^5"
|
"silverstripe/cms": "^5"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^9.5",
|
"phpunit/phpunit": "^9.6",
|
||||||
"squizlabs/php_codesniffer": "^3"
|
"squizlabs/php_codesniffer": "^3"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@ -33,4 +33,4 @@
|
|||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
"prefer-stable": true
|
"prefer-stable": true
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user