Compare commits

..

1 Commits

Author SHA1 Message Date
Steve Boyd
42edd5ab03 MNT Update development dependencies 2022-05-05 10:38:38 +12:00
11 changed files with 90 additions and 81 deletions

1
.gitattributes vendored
View File

@ -1,4 +1,3 @@
.github export-ignore
.cow.json export-ignore
.cow export-ignore
.gitattributes export-ignore

View File

@ -1,27 +0,0 @@
name: CI
on:
push:
pull_request:
workflow_dispatch:
jobs:
ci:
name: CI
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
with:
# installer contains a sample behat.yml file, though there are no behat tests to run
endtoend: false
# 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`
composer_require_extra: silverstripe/recipe-testing:^2 silverstripe/frameworktest:^0.4.2 mikey179/vfsstream:^1.6.10
extra_jobs: |
- endtoend: true
endtoend_suite: admin
endtoend_config: vendor/silverstripe/admin/behat.yml
- endtoend: true
endtoend_suite: asset-admin
endtoend_config: vendor/silverstripe/asset-admin/behat.yml
- endtoend: true
endtoend_suite: cms
endtoend_config: vendor/silverstripe/cms/behat.yml

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,17 +0,0 @@
name: Keepalive
on:
workflow_dispatch:
# The 8th of every month at 4:50pm UTC
schedule:
- cron: '50 16 8 * *'
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
steps:
- name: Keepalive
uses: silverstripe/gha-keepalive@v1

3
.gitignore vendored
View File

@ -4,5 +4,4 @@
/themes/simple/
/_resources/
/public/_resources/
/.graphql-generated/
/public/_graphql/
/.graphql-generated

82
.travis.yml Normal file
View File

@ -0,0 +1,82 @@
version: ~> 1.0
import:
- silverstripe/silverstripe-travis-shared:config/provision/self.yml
env:
global:
- REQUIRE_RECIPE_TESTING="^2"
- REQUIRE_FRAMEWORKTEST="^0.4.2"
# vfsstream is a dev dependency of the assets module
- REQUIRE_EXTRA="mikey179/vfsstream:^1.6.10"
matrix:
fast_finish: true
include:
# Core php tests
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="core"
- PDO=1
- COMPOSER_INSTALL_ARG="--prefer-lowest"
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="framework"
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="core"
- php: 8.0
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="core"
- php: 8.1.0
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="core"
# admin php tests
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin"
- PDO=1
- COMPOSER_INSTALL_ARG="--prefer-lowest"
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin"
- php: 8.0
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin"
- php: 8.1.0
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin"
# behat tests
- php: 7.4
env:
- DB=MYSQL
- BEHAT_TEST=1
- BEHAT_SUITE="admin"
- php: 7.4
env:
- DB=MYSQL
- BEHAT_TEST=1
- BEHAT_SUITE="cms"
- php: 7.4
env:
- DB=MYSQL
- BEHAT_TEST=1
- BEHAT_SUITE="asset-admin"

View File

@ -1,7 +1,6 @@
## Overview
[![CI](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml)
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
[![Build Status](https://api.travis-ci.com/silverstripe/silverstripe-installer.svg?branch=4)](https://travis-ci.com/silverstripe/silverstripe-installer)
Base project folder for a Silverstripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme.

View File

@ -5,9 +5,9 @@
"require": {
"php": "^7.4 || ^8.0",
"silverstripe/recipe-plugin": "^1.2",
"silverstripe/recipe-cms": "4.x-dev",
"silverstripe/recipe-cms": "~4.11.0@beta",
"silverstripe-themes/simple": "~3.2.0",
"silverstripe/login-forms": "4.x-dev"
"silverstripe/login-forms": "~4.7.0@beta"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
@ -15,8 +15,7 @@
"extra": {
"project-files": [
"app/_config/*",
".env.example",
".graphql-generated/*"
".env.example"
],
"public-files": [
"assets/*",

View File

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
PHPUnit configuration for SilverStripe
@ -26,13 +25,9 @@
<directory>vendor/silverstripe/framework/tests/php</directory>
</testsuite>
<!-- Framework ORM tests are split up to run in parallel -->
<testsuite name="framework-core">
<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>
<!-- framework only -->
<testsuite name="framework">
<directory>vendor/silverstripe/framework/tests/php/</directory>
</testsuite>
<!-- other core components -->
@ -47,11 +42,7 @@
<directory>vendor/silverstripe/asset-admin/tests/php/</directory>
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>vendor/silverstripe/cms/tests/</directory>
<directory>vendor/silverstripe/config/tests/</directory>
<directory>vendor/silverstripe/errorpage/tests/</directory>
<directory>vendor/silverstripe/graphql/tests/</directory>
<directory>vendor/silverstripe/login-forms/tests/php/</directory>
<directory>vendor/silverstripe/mimevalidator/tests/</directory>
<directory>vendor/silverstripe/reports/tests/</directory>
<directory>vendor/silverstripe/siteconfig/tests/php/</directory>
</testsuite>