Merge branch '1' into 2

This commit is contained in:
Guy Sartorelli 2024-05-24 11:07:50 +12:00
commit ac5d0484c0
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
8 changed files with 51 additions and 7 deletions

21
.github/workflows/dispatch-ci.yml vendored Normal file
View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -4,7 +4,9 @@ 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:
@ -12,6 +14,10 @@ jobs:
# 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

View File

@ -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

View File

@ -3,6 +3,7 @@
namespace SilverStripe\FrameworkTest\Model;
use Page;
use SilverStripe\Forms\EmailField;
use SilverStripe\Forms\RequiredFields;
use SilverStripe\Forms\TextField;
@ -29,7 +30,7 @@ class MultiTabPage extends Page
{
$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;

View File

@ -33,5 +33,9 @@
"psr-4": {
"SSilverStripe\\FrameworkTest\\": "code/"
}
},
"require-dev": {
"silverstripe/standards": "^1",
"phpstan/extension-installer": "^1.3"
}
}

3
phpstan.neon.dist Normal file
View File

@ -0,0 +1,3 @@
parameters:
paths:
- code