Skip to content

Commit

Permalink
Merge upstream/6.3 into simplify6
Browse files Browse the repository at this point in the history
  • Loading branch information
lukereative committed Dec 18, 2024
2 parents f1f37ad + a5fae3c commit 93d3983
Show file tree
Hide file tree
Showing 249 changed files with 5,537 additions and 5,855 deletions.
6 changes: 0 additions & 6 deletions .eslintrc

This file was deleted.

1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@silverstripe/eslint-config/.eslintrc');
13 changes: 9 additions & 4 deletions .github/workflows/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
name: Dispatch CI

on:
# At 12:00 PM UTC, only on Sunday and Monday
# At 3:15 AM UTC, only on Sunday and Monday
schedule:
- cron: '0 12 * * 0,1'
- cron: '15 3 * * 0,1'

permissions: {}

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

on:
workflow_dispatch:
# The 8th of every month at 12:50pm UTC
# At 12:00 AM UTC, on day 1 of the month
schedule:
- cron: '50 12 8 * *'
- cron: '0 0 1 * *'
workflow_dispatch:

permissions: {}

jobs:
keepalive:
name: Keepalive
# Only run cron on the symbiote account
if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
permissions:
actions: write
steps:
- name: Keepalive
uses: silverstripe/gha-keepalive@v1
22 changes: 22 additions & 0 deletions .github/workflows/merge-up.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Merge-up

on:
# At 3:15 AM UTC, only on Thursday
schedule:
- cron: '15 3 * * 4'
workflow_dispatch:

permissions: {}

jobs:
merge-up:
name: Merge-up
# Only run cron on the symbiote account
if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
permissions:
contents: write
actions: write
steps:
- name: Merge-up
uses: silverstripe/gha-merge-up@v1
26 changes: 26 additions & 0 deletions .github/workflows/tag-patch-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Tag patch release

on:
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch
workflow_dispatch:
inputs:
latest_local_sha:
description: The latest local sha
required: true
type: string

permissions: {}

jobs:
tagpatchrelease:
name: Tag patch release
# Only run cron on the symbiote account
if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Tag release
uses: silverstripe/gha-tag-release@v2
with:
latest_local_sha: ${{ inputs.latest_local_sha }}
12 changes: 9 additions & 3 deletions .github/workflows/update-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@ name: Update JS

on:
workflow_dispatch:
# Run on a schedule of once per quarter
# At 7:35 AM UTC, on day 1 of the month, only in March and September
schedule:
- cron: '0 0 1 */3 *'
- cron: '35 7 1 3,9 *'

permissions: {}

jobs:
update-js:
name: Update JS
# Only run cron on the silverstripe account
# Only run cron on the symbiote account
if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
actions: write
steps:
- name: Update JS
uses: silverstripe/gha-update-js@v1
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
18
97 changes: 0 additions & 97 deletions .sass-lint.yml

This file was deleted.

1 change: 1 addition & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@silverstripe/eslint-config/.stylelintrc');
39 changes: 0 additions & 39 deletions .upgrade.yml

This file was deleted.

File renamed without changes.
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ A module that provides an action / transition approach to workflow, where a
single workflow process is split into multiple configurable states (Actions)
with multiple possible transitions between the actions.

## Requirements

* Silverstripe Framework and CMS 3.1 or newer
* (Optional) [Queued Jobs module](https://github.com/nyeholt/silverstripe-queuedjobs) (for embargo/expiry functionality)

Note: The Silverstripe 2.4 version of the module is available from the ss24
branch of the repository.

## Installation
`composer require dnadesign/silverstripe-workflow`
```
Expand Down
15 changes: 0 additions & 15 deletions _config/legacy.yml

This file was deleted.

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"
]
}
Loading

0 comments on commit 93d3983

Please sign in to comment.