Compare commits

...

79 Commits
4.6.1 ... 4

Author SHA1 Message Date
Guy Sartorelli 69aa62b192
MNT Update development dependencies 2023-04-26 12:45:13 +12:00
Guy Sartorelli 956f23ef1b
Merge branch '4.13' into 4 2023-04-26 12:45:13 +12:00
Guy Sartorelli a99f146452
MNT Update development dependencies 2023-04-26 12:07:57 +12:00
Guy Sartorelli 8eaebc6fa7
MNT Update release dependencies 2023-04-26 12:07:53 +12:00
Guy Sartorelli 9e965dd46a
MNT Update development dependencies 2023-03-29 12:37:01 +13:00
Guy Sartorelli 94c0b4904a
MNT Update release dependencies 2023-03-29 12:36:58 +13:00
Guy Sartorelli 4eb77877be
MNT Update development dependencies 2023-03-29 09:39:37 +13:00
Maxime Rainville dd8c8edc56
Merge pull request #71 from creative-commoners/pulls/4/dispatch-ci
MNT Use gha-dispatch-ci
2023-03-23 14:15:41 +13:00
Steve Boyd eb352f49e3 MNT Use gha-dispatch-ci 2023-03-21 12:27:44 +13:00
Guy Sartorelli 8595b7f657
MNT Update development dependencies 2023-03-10 16:31:29 +13:00
Guy Sartorelli 8ec6751db6
MNT Update release dependencies 2023-03-10 16:31:25 +13:00
Guy Sartorelli 45dfd7e145
MNT Update development dependencies 2023-03-10 12:21:28 +13:00
Guy Sartorelli b8f12e473d
Merge pull request #70 from creative-commoners/pulls/4/plugin
DEP Require ^1.7 of silverstripe/recipe-plugin
2023-03-08 16:55:58 +13:00
Steve Boyd f522367605 DEP Require ^1.7 of silverstripe/recipe-plugin 2023-03-08 15:11:26 +13:00
Guy Sartorelli 5cbabe8848
Merge branch '4.12' into 4 2022-12-20 09:05:04 +13:00
Guy Sartorelli d51848821f
Merge pull request #66 from creative-commoners/pulls/4.12/graphql-deps
DEP Ensure graphql v3 is still installable
2022-12-20 09:03:40 +13:00
Guy Sartorelli af0e535991
Merge pull request #67 from creative-commoners/pulls/4/fix-graphql-dep
DEP Ensure graphql v3 is still installable
2022-12-20 09:03:36 +13:00
Guy Sartorelli b4ba1ccde7
DEP Ensure graphql v3 is still installable 2022-12-19 17:04:29 +13:00
Guy Sartorelli 3da707469d
DEP Ensure graphql v3 is still installable 2022-12-19 17:03:34 +13:00
Guy Sartorelli 16bd35a030
MNT Update development dependencies 2022-12-19 01:54:29 +00:00
Guy Sartorelli 40b91c4d2b
Merge branch '4.12' into 4 2022-12-19 01:54:29 +00:00
Guy Sartorelli 0574971f42
MNT Update development dependencies 2022-12-19 01:54:25 +00:00
Guy Sartorelli bd10022c57
Merge branch '4.12-release' into 4.12 2022-12-19 14:51:49 +13:00
Guy Sartorelli 8278db4db6
MNT Update release dependencies 2022-12-19 01:25:43 +00:00
Guy Sartorelli c1f535ba4a
MNT Update release dependencies 2022-11-30 03:27:12 +00:00
Guy Sartorelli 25e54e0277
Merge pull request #64 from creative-commoners/pulls/4.12/minor-xdev
MNT Update development dependencies
2022-11-28 12:56:07 +13:00
Steve Boyd 0728ab6f95 MNT Update development dependencies 2022-11-23 15:56:03 +13:00
Steve Boyd 7560dcd4ba Merge branch '4.11' into 4.12-release 2022-11-22 12:26:13 +13:00
Steve Boyd 000bf7fa1d Merge branch '4.11-release' into 4.11 2022-11-22 12:25:45 +13:00
Guy Sartorelli d68ae7b0d6
Merge pull request #63 from creative-commoners/pulls/4.11/4.11.1
MNT Update release dependencies
2022-11-22 12:08:04 +13:00
Steve Boyd adc98cee4b MNT Update release dependencies 2022-11-22 10:21:24 +13:00
Guy Sartorelli 85601e8668
MNT Update development dependencies 2022-11-10 23:51:27 +00:00
Steve Boyd 656e52f60f Merge branch '4.11' into 4 2022-08-02 18:53:04 +12:00
Steve Boyd 416dd2d043 Merge branch '4.10' into 4.11 2022-08-02 18:53:00 +12:00
Guy Sartorelli 1191bf337c
Merge pull request #58 from creative-commoners/pulls/4.10/standardise-modules
MNT Standardise modules
2022-08-02 15:26:52 +12:00
Steve Boyd 46b7dc38e1 MNT Standardise modules 2022-08-01 10:44:06 +12:00
Steve Boyd f326932b7f Merge branch '4.11' into 4 2022-07-25 09:46:14 +12:00
Steve Boyd 274e0c2738 Merge branch '4.10' into 4.11 2022-07-25 09:46:10 +12:00
Guy Sartorelli 0690aba618
Merge pull request #57 from creative-commoners/pulls/4.10/module-standards
MNT Use GitHub Actions CI
2022-07-15 17:39:20 +12:00
Steve Boyd 4e95fbeee3 MNT Use GitHub Actions CI 2022-07-05 19:01:43 +12:00
Steve Boyd b908975f0e Merge branch '4.11' into 4 2022-05-10 22:08:39 +12:00
Guy Sartorelli b68e22127b
Merge pull request #56 from creative-commoners/pulls/4.11/g3g4
DEP Allow graphql 3.8 dev dependency
2022-05-09 17:33:17 +12:00
Steve Boyd 5665a593c1 DEP Allow graphql 3.8 dev dependency 2022-05-09 17:03:39 +12:00
Guy Sartorelli 3f64199c1a
Merge pull request #55 from creative-commoners/pulls/4.11/devreq
DEP 4.11 dev requirements
2022-05-06 15:23:21 +12:00
Steve Boyd ff4400ac31 DEP 4.11 dev requirements 2022-05-06 14:03:12 +12:00
Maxime Rainville 4074285383
Merge pull request #54 from creative-commoners/pulls/4/php74
DEP Set PHP 7.4 as the minimum version
2022-02-18 21:56:10 +13:00
Steve Boyd e3f80d5dee DEP Set PHP 7.4 as the minimum version 2022-02-10 17:25:32 +13:00
GuySartorelli ea3c4b16c7
DOC Change "SilverStripe" to "Silverstripe" in readme (#53) 2022-02-02 10:11:48 +13:00
Steve Boyd 388135e10a Merge branch '4.10' into 4 2021-12-22 10:08:12 +13:00
Maxime Rainville a24963a3a9
Merge pull request #52 from creative-commoners/pulls/4.10/deps
DEP 4.10 requirements
2021-12-02 14:59:51 +13:00
Steve Boyd 82be460186 DEP 4.10 requirements 2021-11-29 15:50:18 +13:00
Steve Boyd 4472888d7b
Merge pull request #51 from creative-commoners/pulls/4/sapphire-test-nine
API phpunit 9 support
2021-11-09 15:06:10 +13:00
Steve Boyd ef2201f1fe API phpunit 9 support 2021-11-05 09:47:39 +13:00
Maxime Rainville 1bba7a2976 MNT target 4.x release 2021-09-03 11:27:24 +12:00
Maxime Rainville 8e23b8c4fe MNT target 4.9 release 2021-09-03 11:25:43 +12:00
Steve Boyd 33955216a7
Merge pull request #49 from creative-commoners/pulls/4/loosen-constraint
MNT Loosen dependencies
2021-08-26 11:15:28 +12:00
Maxime Rainville 284f2f6fa3 MNT Loosen dependencies 2021-08-26 10:35:58 +12:00
Maxime Rainville 6fe092aeaf
Merge pull request #48 from creative-commoners/pulls/4/add-session-manager
DEP Add session manager
2021-08-19 15:25:27 +12:00
Steve Boyd 03c6888a7f DEP Add session manager 2021-08-19 14:33:33 +12:00
Steve Boyd f748db6878 Merge branch '4.8' into 4 2021-05-17 15:57:50 +12:00
Steve Boyd 53f9a7f594 DEP Use versioned 1.8 2021-05-17 15:56:31 +12:00
Steve Boyd b7e61c1f1c MNT Remove COMPOSER_ROOT_VERSION 2021-05-17 15:53:11 +12:00
Andre Kiste 53def4589c
Merge pull request #45 from creative-commoners/pulls/4.8/reqs
DEP Update dependencies for CMS 4.8
2021-05-17 15:16:50 +12:00
Steve Boyd 861afaddae DEP Update dependencies for CMS 4.8 2021-05-17 13:23:00 +12:00
Steve Boyd 3e7ecaaacc
Update README.md 2021-01-21 16:01:03 +13:00
Steve Boyd 6ce413d43e
Merge pull request #43 from a2nt/patch-1
Upgrade silverstripe/recipe-plugin to support composer 2.0
2020-12-31 18:08:27 +13:00
Steve Boyd 9068196bb3 Merge branch '4.7' into 4 2020-12-31 18:04:45 +13:00
Tony Air 959e61b9e5
Upgrade silverstripe/recipe-plugin to support composer 2.0
The "silverstripe/recipe-plugin" plugin was skipped because it requires a Plugin API version ("^1.1") that does not match your Composer installation ("2.0.0"). You may need to run composer update with the "--no-plugins" option.
2020-12-28 06:48:24 +07:00
Andre Kiste 4aa484ba2d
Merge pull request #42 from creative-commoners/pulls/4.7/travis-shared
MNT Travis shared config
2020-12-21 14:29:41 +13:00
Steve Boyd e3a0200bda MNT Travis shared config 2020-12-02 11:28:49 +13:00
Aaron Carlino d69f89d972
Allow graphql 4 (#41) 2020-11-13 17:13:16 +13:00
Steve Boyd 9936e8fd3f Merge branch '4.7' into 4 2020-11-12 15:12:41 +13:00
Serge Latyntsev ed6f2fd7b5
Merge pull request #40 from creative-commoners/pulls/4.7/update-47-deps
DEP Update requirements to 4.7.x-dev
2020-11-05 11:50:07 +13:00
Steve Boyd 840644b96d DEP Update requirements to 4.7.x-dev 2020-11-05 11:28:16 +13:00
Serge Latyntsev a0720394ff
Merge pull request #39 from creative-commoners/pulls/4/php-8-builds
MNT Add PHP 8 build
2020-10-23 11:20:02 +13:00
Garion Herman 3ff3c8a196 MNT Use latest build of silverstripe/cow 2020-10-16 09:57:28 +13:00
Garion Herman 6c96e7a69f MNT Add PHP 8 build 2020-10-14 14:25:49 +13:00
Robbie Averill eec0010012
Merge pull request #37 from open-sausages/pulls/4/set-up-47-dev
Merge up 4.6 branch + update travis to target x-dev branches
2020-06-04 09:10:06 -07:00
Maxime Rainville 90b3141d0b Update travis config to target x-dev branches 2020-06-04 15:05:08 +12:00
8 changed files with 84 additions and 71 deletions

View File

@ -1,7 +1,7 @@
{
"github-slug": "silverstripe/recipe-cms",
"child-stability-inherit": true,
"dependency-constraint": "exact",
"dependency-constraint": "loose",
"vendors": [
"silverstripe"
],

11
.github/workflows/ci.yml vendored Normal file
View File

@ -0,0 +1,11 @@
name: CI
on:
push:
pull_request:
workflow_dispatch:
jobs:
ci:
name: CI
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

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

@ -0,0 +1,16 @@
name: Dispatch CI
on:
# At 2:10 PM UTC, only on Thursday and Friday
schedule:
- cron: '10 14 * * 4,5'
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

17
.github/workflows/keepalive.yml vendored Normal file
View File

@ -0,0 +1,17 @@
name: Keepalive
on:
workflow_dispatch:
# The 4th of every month at 10:50am UTC
schedule:
- cron: '50 10 4 * *'
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

View File

@ -1,38 +0,0 @@
language: php
dist: xenial
services:
- mysql
- postgresql
env:
global:
- COMPOSER_ROOT_VERSION=4.6.x-dev
matrix:
include:
- php: 7.1
env: DB=MYSQL
- php: 7.2
env: DB=PGSQL
- php: 7.3
env: DB=MYSQL
- php: 7.4
env: DB=MYSQL
before_script:
- phpenv rehash
- phpenv config-rm xdebug.ini
- composer validate
- composer require --no-update silverstripe-themes/simple:~3.2.0
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --no-update; fi
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
# Validate cow schema
- composer global require silverstripe/cow ^2
- ~/.config/composer/vendor/bin/cow schema:validate
script:
- vendor/bin/phpunit --testsuite recipe-cms

View File

@ -1,8 +1,9 @@
## SilverStripe CMS Recipe
## Silverstripe CMS Recipe
[![Build Status](https://travis-ci.org/silverstripe/recipe-cms.svg?branch=4)](https://travis-ci.org/silverstripe/recipe-cms)
[![CI](https://github.com/silverstripe/recipe-cms/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/recipe-cms/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/)
Base page and asset content-editing recipe for a SilverStripe ([http://silverstripe.org](http://silverstripe.org))
Base page and asset content-editing recipe for a Silverstripe ([http://silverstripe.org](http://silverstripe.org))
installation. This includes the modules:
Provided by [silverstripe/recipe-core]:
@ -21,11 +22,12 @@ Provided by [silverstripe/recipe-cms]:
* [errorpage](http://github.com/silverstripe/silverstripe-errorpage)
* [reports](http://github.com/silverstripe/silverstripe-reports)
* [graphql](http://github.com/silverstripe/silverstripe-graphql)
* [session-manager](http://github.com/silverstripe/silverstripe-session-manager)
* [siteconfig](http://github.com/silverstripe/silverstripe-siteconfig)
* [versioned](http://github.com/silverstripe/silverstripe-versioned)
This can be either added to an existing project or used as a project base for creating a
fully featured SilverStripe CMS project.
fully featured Silverstripe CMS project.
See the [recipe plugin](https://github.com/silverstripe/recipe-plugin) page for instructions on how
SilverStripe recipes work.
Silverstripe recipes work.

View File

@ -5,22 +5,23 @@
"homepage": "http://silverstripe.org",
"license": "BSD-3-Clause",
"require": {
"silverstripe/recipe-plugin": "^1.2",
"silverstripe/recipe-core": "4.6.x-dev",
"silverstripe/admin": "1.6.x-dev",
"silverstripe/asset-admin": "1.6.x-dev",
"silverstripe/campaign-admin": "1.6.x-dev",
"silverstripe/versioned-admin": "1.6.x-dev",
"silverstripe/cms": "4.6.x-dev",
"silverstripe/errorpage": "1.6.x-dev",
"silverstripe/graphql": "3.3.x-dev",
"silverstripe/reports": "4.6.x-dev",
"silverstripe/siteconfig": "4.6.x-dev",
"silverstripe/versioned": "1.6.x-dev"
"php": "^7.4 || ^8.0",
"silverstripe/recipe-plugin": "^1.7",
"silverstripe/recipe-core": "4.x-dev",
"silverstripe/admin": "1.x-dev",
"silverstripe/asset-admin": "1.x-dev",
"silverstripe/campaign-admin": "1.x-dev",
"silverstripe/versioned-admin": "1.x-dev",
"silverstripe/cms": "4.x-dev",
"silverstripe/errorpage": "1.x-dev",
"silverstripe/reports": "4.x-dev",
"silverstripe/siteconfig": "4.x-dev",
"silverstripe/versioned": "1.x-dev",
"silverstripe/graphql": "3.x-dev || 4.x-dev",
"silverstripe/session-manager": "1.x-dev"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"sminnee/phpunit-mock-objects": "^3.4.5"
"phpunit/phpunit": "^9.5"
},
"extra": {
"project-files": [
@ -33,4 +34,4 @@
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}

View File

@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
<testsuite name="recipe-cms">
<directory>vendor/silverstripe/admin/tests</directory>
<directory>vendor/silverstripe/asset-admin/tests</directory>
<directory>vendor/silverstripe/campaign-admin/tests</directory>
<directory>vendor/silverstripe/cms/tests</directory>
<directory>vendor/silverstripe/errorpage/tests</directory>
<directory>vendor/silverstripe/graphql/tests</directory>
<directory>vendor/silverstripe/reports/tests</directory>
<directory>vendor/silverstripe/siteconfig/tests</directory>
<directory>vendor/silverstripe/versioned/tests</directory>
<directory>vendor/silverstripe/versioned-admin/tests</directory>
</testsuite>
<testsuites>
<testsuite name="recipe-cms">
<directory>vendor/silverstripe/admin/tests</directory>
<directory>vendor/silverstripe/asset-admin/tests</directory>
<directory>vendor/silverstripe/campaign-admin/tests</directory>
<directory>vendor/silverstripe/cms/tests</directory>
<directory>vendor/silverstripe/errorpage/tests</directory>
<directory>vendor/silverstripe/graphql/tests</directory>
<directory>vendor/silverstripe/reports/tests</directory>
<directory>vendor/silverstripe/session-manager/tests</directory>
<directory>vendor/silverstripe/siteconfig/tests</directory>
<directory>vendor/silverstripe/versioned/tests</directory>
<directory>vendor/silverstripe/versioned-admin/tests</directory>
</testsuite>
</testsuites>
</phpunit>