Skip to content

Commit

Permalink
Merge branch '4'
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Aug 15, 2023
2 parents 793a547 + 6a47857 commit 58f3dee
Show file tree
Hide file tree
Showing 18 changed files with 4,791 additions and 4,260 deletions.
11 changes: 11 additions & 0 deletions .github/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: CI

on:
push:
pull_request:
workflow_dispatch:

jobs:
ci:
name: CI
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
16 changes: 16 additions & 0 deletions .github/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Dispatch CI

on:
# At 4:10 PM UTC, only on Sunday and Monday
schedule:
- cron: '10 16 * * 0,1'

jobs:
dispatch-ci:
name: Dispatch CI
# Only run cron on the colymba account
if: (github.event_name == 'schedule' && github.repository_owner == 'colymba') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1
17 changes: 17 additions & 0 deletions .github/keepalive.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Keepalive

on:
workflow_dispatch:
# The 4th of every month at 10:50am UTC
schedule:
- cron: '50 10 4 * *'

jobs:
keepalive:
name: Keepalive
# Only run cron on the colymba account
if: (github.event_name == 'schedule' && github.repository_owner == 'colymba') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Keepalive
uses: silverstripe/gha-keepalive@v1
17 changes: 17 additions & 0 deletions .github/update-js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Update JS

on:
workflow_dispatch:
# Run on a schedule of once per quarter
schedule:
- cron: '0 0 1 */3 *'

jobs:
update-js:
name: Update JS
# Only run cron on the colymba account
if: (github.event_name == 'schedule' && github.repository_owner == 'colymba') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Update JS
uses: silverstripe/gha-update-js@v1
6 changes: 3 additions & 3 deletions .github/workflows/keepalive.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Keepalive

on:
workflow_dispatch:
# The 4th of every month at 10:50am UTC
# At 11:55 PM UTC, on day 20 of the month
schedule:
- cron: '50 10 4 * *'
- cron: '55 23 20 * *'
workflow_dispatch:

jobs:
keepalive:
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/merge-up.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Merge-up

on:
# At 11:55 PM UTC, only on Friday
schedule:
- cron: '55 23 * * 5'
workflow_dispatch:

jobs:
merge-up:
name: Merge-up
# Only run cron on the colymba account
if: (github.event_name == 'schedule' && github.repository_owner == 'colymba') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Merge-up
uses: silverstripe/gha-merge-up@v1
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
18
69 changes: 0 additions & 69 deletions .scrutinizer.yml

This file was deleted.

6 changes: 2 additions & 4 deletions .tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ source_lang = en
type = YML

[o:silverstripe:p:silverstripe-gridfield-bulk-editing-tools:r:master-js]
file_filter = client/lang/src/<lang>.json
source_file = client/lang/src/en.json
file_filter = client/src/lang/<lang>.json
source_file = client/src/lang/en.json
source_lang = en
type = KEYVALUEJSON


6 changes: 6 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react"
]
}
2 changes: 1 addition & 1 deletion client/dist/js/main.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 58f3dee

Please sign in to comment.