Skip to content

Commit

Permalink
Merge branch '1' into 2
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed May 23, 2024
2 parents f87f2c2 + fcf39f1 commit ac5d048
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 7 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Dispatch CI

on:
# At 12:00 AM UTC, only on Wednesday and Thursday
schedule:
- cron: '0 0 * * 3,4'

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')
runs-on: ubuntu-latest
permissions:
contents: read
actions: write
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1
8 changes: 6 additions & 2 deletions .github/workflows/keepalive.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
name: Keepalive

on:
# At 1:05 PM UTC, on day 22 of the month
# At 9:45 PM UTC, on day 18 of the month
schedule:
- cron: '5 13 22 * *'
- cron: '45 21 18 * *'
workflow_dispatch:

permissions: {}

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

on:
# At 2:20 PM UTC, only on Saturday
# At 12:00 AM UTC, only on Sunday
schedule:
- cron: '20 14 * * 6'
- cron: '0 0 * * 0'
workflow_dispatch:

permissions: {}

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
permissions:
contents: write
actions: write
steps:
- name: Merge-up
uses: silverstripe/gha-merge-up@v1
8 changes: 7 additions & 1 deletion .github/workflows/update-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@ on:
workflow_dispatch:
# Run on a schedule of once per quarter
schedule:
- cron: '0 0 1 */3 *'
- cron: '20 4 1 */3 *'

permissions: {}

jobs:
update-js:
name: Update JS
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (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 LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2008-2023, SilverStripe Limited - www.silverstripe.com
Copyright (c) 2008-2023, Silverstripe Limited - www.silverstripe.com
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
3 changes: 2 additions & 1 deletion code/multitab-validation/MultiTabPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace SilverStripe\FrameworkTest\Model;

use Page;
use SilverStripe\Forms\EmailField;
use SilverStripe\Forms\RequiredFields;
use SilverStripe\Forms\TextField;

Expand All @@ -29,7 +30,7 @@ public function getCMSFields()
{
$fields = parent::getCMSFields();
$fields->addFieldToTab("Root.Second", TextField::create("SecondTabFirstField"));
$fields->addFieldToTab("Root.Third", TextField::create("ThirdTabFirstField"));
$fields->addFieldToTab("Root.Third", EmailField::create("ThirdTabFirstField"));
$fields->addFieldToTab("Root.Third", TextField::create("ThirdTabSecondField"));
$fields->addFieldToTab("Root.Fourth", TextField::create("FourthTabFirstField"));
return $fields;
Expand Down
4 changes: 4 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,9 @@
"psr-4": {
"SSilverStripe\\FrameworkTest\\": "code/"
}
},
"require-dev": {
"silverstripe/standards": "^1",
"phpstan/extension-installer": "^1.3"
}
}
3 changes: 3 additions & 0 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
parameters:
paths:
- code

0 comments on commit ac5d048

Please sign in to comment.