Compare commits

..

18 Commits
4 ... 5.0.0-rc1

Author SHA1 Message Date
Steve Boyd
96e34a5cd1 MNT Update release dependencies 2023-04-05 14:54:39 +12:00
Steve Boyd
1316480faf MNT Update development dependencies 2023-04-05 11:54:35 +12:00
Maxime Rainville
a564e32580
Merge pull request #350 from creative-commoners/pulls/5.0/optimal-file-resolution
ENH Remove duplicated configuration
2023-02-26 21:05:15 +13:00
Guy Sartorelli
c9bfb0e2a6
ENH Remove duplicated configuration
This is the default configuration in assets now. No need to double up on
it.
2023-02-24 10:38:53 +13:00
Steve Boyd
f89a827515 MNT Update development dependencies 2023-02-09 15:04:56 +13:00
Steve Boyd
602914a5e3 MNT Update release dependencies 2023-02-09 15:04:52 +13:00
Steve Boyd
dd70bec9f4 MNT Update development dependencies 2023-02-09 12:36:37 +13:00
Guy Sartorelli
5097dee0d7
Merge pull request #349 from creative-commoners/pulls/5/caret
DEP Use caret for plugins
2023-02-08 15:14:41 +13:00
Steve Boyd
7b49f0e129 DEP Use caret for plugins 2023-02-08 12:11:59 +13:00
Steve Boyd
516042084d Merge branch '4' into 5 2023-02-02 16:39:14 +13:00
Steve Boyd
d150c0058d Merge branch '4' into 5 2023-02-02 16:36:08 +13:00
Guy Sartorelli
9ed58415ab
MNT Remove unnecessary .htaccess file (#342)
This file will be pulled in from recipe-core
2022-12-16 10:06:35 +13:00
Guy Sartorelli
406ee71a48
DEP Require dev branches for composer plugins (#340)
This will fix a problem where our CI is checking out the alpha versions
instead of the current dev branch
2022-12-15 11:48:52 +13:00
Guy Sartorelli
30e39e3da7
Merge pull request #336 from creative-commoners/pulls/5/remove-email-config
MNT Remove unused email config
2022-10-20 13:39:04 +13:00
Steve Boyd
ddad942ea8 MNT Remove unused email config 2022-10-11 20:36:23 +13:00
Guy Sartorelli
06d822eda6
Merge pull request #331 from creative-commoners/pulls/5/major-deps
DEP Update core dependencies for CMS 5
2022-08-09 10:07:58 +12:00
Guy Sartorelli
1f718dcf54
ENH Remove resources-dir config from composer.json (#330) 2022-08-05 13:53:37 +12:00
Steve Boyd
8ca19d5eb7 DEP Update core dependencies for CMS 5 2022-08-05 09:35:35 +12:00
7 changed files with 15 additions and 67 deletions

View File

@ -4,17 +4,22 @@ on:
push: push:
pull_request: pull_request:
workflow_dispatch: workflow_dispatch:
# Every day at 4:00pm UTC
schedule:
- cron: '0 16 * * *'
jobs: jobs:
ci: ci:
name: CI name: CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
with: with:
# installer contains a sample behat.yml file, though there are no behat tests to run # installer contains a sample behat.yml file, though there are no behat tests to run
endtoend: false endtoend: false
# require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike # require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike
# regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer` # regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer`
composer_require_extra: silverstripe/recipe-testing:^2 silverstripe/frameworktest:^0.4.2 mikey179/vfsstream:^1.6.10 composer_require_extra: silverstripe/recipe-testing:^3 silverstripe/frameworktest:^1 mikey179/vfsstream:^1.6.10
extra_jobs: | extra_jobs: |
- endtoend: true - endtoend: true
endtoend_suite: admin endtoend_suite: admin

View File

@ -1,16 +0,0 @@
name: Dispatch CI
on:
# At 4:00 PM and 5:00 PM
schedule:
- cron: '0 16,17 * * *'
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
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1

View File

@ -1,2 +0,0 @@
RewriteEngine On
RewriteRule ^(.*)$ public/$1

View File

@ -1,26 +0,0 @@
# SilverStripe 4.4 changes the way files are resolved. `silverstripe-assets` resolves files using a variety of formats
# by default. When starting a brand new project on SilverStripe 4.4 or greater, those extra formats are not needed and
# will slowdown file resolution requests a bit. This config removes those redundant formats.
---
Name: project-assetsflysystem
After: '#assetsflysystem'
---
SilverStripe\Core\Injector\Injector:
# Define public resolution strategy
SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.public:
class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
properties:
ResolutionFileIDHelpers:
- '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
- '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
VersionedStage: Live
# Define protected resolution strategy
SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.protected:
class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
properties:
DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
ResolutionFileIDHelpers:
- '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
VersionedStage: Stage

View File

@ -1,9 +0,0 @@
# See https://docs.silverstripe.org/en/4/developer_guides/email/ for additional information about setting up email
---
Name: project-emailconfig
After:
- '#emailconfig'
---
SilverStripe\Core\Injector\Injector:
Swift_Transport:
class: Swift_SendmailTransport

View File

@ -3,11 +3,12 @@
"type": "silverstripe-recipe", "type": "silverstripe-recipe",
"description": "The SilverStripe Framework Installer", "description": "The SilverStripe Framework Installer",
"require": { "require": {
"php": "^7.4 || ^8.0", "php": "^8.1",
"silverstripe/recipe-plugin": "^1.2", "silverstripe/recipe-plugin": "~2.0.0@stable",
"silverstripe/recipe-cms": "4.x-dev", "silverstripe/vendor-plugin": "~2.0.0@stable",
"silverstripe/recipe-cms": "~5.0.0@rc",
"silverstripe-themes/simple": "~3.2.0", "silverstripe-themes/simple": "~3.2.0",
"silverstripe/login-forms": "4.x-dev" "silverstripe/login-forms": "~5.0.0@rc"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.5" "phpunit/phpunit": "^9.5"
@ -21,8 +22,7 @@
"public-files": [ "public-files": [
"assets/*", "assets/*",
"favicon.ico" "favicon.ico"
], ]
"resources-dir": "_resources"
}, },
"config": { "config": {
"process-timeout": 600, "process-timeout": 600,

View File

@ -26,13 +26,9 @@
<directory>vendor/silverstripe/framework/tests/php</directory> <directory>vendor/silverstripe/framework/tests/php</directory>
</testsuite> </testsuite>
<!-- Framework ORM tests are split up to run in parallel --> <!-- framework only -->
<testsuite name="framework-core"> <testsuite name="framework">
<directory>vendor/silverstripe/framework/tests/php</directory> <directory>vendor/silverstripe/framework/tests/php/</directory>
<exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
</testsuite>
<testsuite name="framework-orm">
<directory>vendor/silverstripe/framework/tests/php/ORM</directory>
</testsuite> </testsuite>
<!-- other core components --> <!-- other core components -->