From 04f79f735970f52a3b945ffb27792bf37eab4e8b Mon Sep 17 00:00:00 2001 From: Dan Hensby Date: Sat, 4 Aug 2018 13:02:05 +0200 Subject: [PATCH 1/4] Update composer constraints --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 08574d0..32f8c34 100644 --- a/composer.json +++ b/composer.json @@ -6,16 +6,16 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-core": "4.2.1@stable", - "silverstripe/admin": "1.2.1@stable", - "silverstripe/asset-admin": "1.2.1@stable", - "silverstripe/campaign-admin": "1.2.1@stable", - "silverstripe/cms": "4.2.1@stable", - "silverstripe/errorpage": "1.2.1@stable", - "silverstripe/graphql": "2.0.1@stable", - "silverstripe/reports": "4.2.1@stable", - "silverstripe/siteconfig": "4.2.1@stable", - "silverstripe/versioned": "1.2.1@stable" + "silverstripe/recipe-core": "4.2.x-dev", + "silverstripe/admin": "1.2.x-dev", + "silverstripe/asset-admin": "1.2.x-dev", + "silverstripe/campaign-admin": "1.2.x-dev", + "silverstripe/cms": "4.2.x-dev", + "silverstripe/errorpage": "1.2.x-dev", + "silverstripe/graphql": "2.0.x-dev", + "silverstripe/reports": "4.2.x-dev", + "silverstripe/siteconfig": "4.2.x-dev", + "silverstripe/versioned": "1.2.x-dev" }, "require-dev": { "phpunit/PHPUnit": "^5.7" @@ -30,4 +30,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +} From e535a2af8d56de31fa66cbf8159f1b945cc75936 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 16 Oct 2018 12:00:57 +0200 Subject: [PATCH 2/4] Add Travis builds for CMS recipe modules --- .travis.yml | 32 ++++++++++++++++++++++++++++++++ README.md | 2 ++ composer.json | 4 ++-- phpunit.xml.dist | 14 ++++++++++++++ 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 .travis.yml create mode 100644 phpunit.xml.dist diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..2216c02 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,32 @@ +language: php + +env: + global: + - COMPOSER_ROOT_VERSION=4.3.x-dev + +matrix: + include: + - php: 5.6 + env: DB=MYSQL + - php: 7.0 + env: DB=PGSQL + - php: 7.1 + env: DB=MYSQL + - php: 7.2 + 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.1.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 diff --git a/README.md b/README.md index 5fb6cfa..628cc23 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## SilverStripe CMS Recipe +[![Build Status](https://travis-ci.org/silverstripe/recipe-cms.svg?branch=4)](https://travis-ci.org/silverstripe/recipe-cms) + Base page and asset content-editing recipe for a SilverStripe ([http://silverstripe.org](http://silverstripe.org)) installation. This includes the modules: diff --git a/composer.json b/composer.json index 5a4a54d..28ca0fe 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "silverstripe/versioned": "1.3.x-dev" }, "require-dev": { - "phpunit/PHPUnit": "^5.7" + "phpunit/phpunit": "^5.7" }, "extra": { "project-files": [ @@ -31,4 +31,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +} diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 0000000..241582a --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,14 @@ + + + vendor/silverstripe/admin/tests + vendor/silverstripe/asset-admin/tests + vendor/silverstripe/campaign-admin/tests + vendor/silverstripe/cms/tests + vendor/silverstripe/errorpage/tests + vendor/silverstripe/graphql/tests + vendor/silverstripe/reports/tests + vendor/silverstripe/siteconfig/tests + vendor/silverstripe/versioned/tests + vendor/silverstripe/versioned-admin/tests + + From 7952bee96186062c3667939839da85a8d50dafda Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Tue, 12 Feb 2019 17:07:28 +1300 Subject: [PATCH 3/4] Update development dependencies --- composer.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 32f8c34..09e630c 100644 --- a/composer.json +++ b/composer.json @@ -6,16 +6,16 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-core": "4.2.x-dev", - "silverstripe/admin": "1.2.x-dev", - "silverstripe/asset-admin": "1.2.x-dev", - "silverstripe/campaign-admin": "1.2.x-dev", - "silverstripe/cms": "4.2.x-dev", - "silverstripe/errorpage": "1.2.x-dev", - "silverstripe/graphql": "2.0.x-dev", - "silverstripe/reports": "4.2.x-dev", - "silverstripe/siteconfig": "4.2.x-dev", - "silverstripe/versioned": "1.2.x-dev" + "silverstripe/recipe-core": "4.2.4@stable", + "silverstripe/admin": "1.2.4@stable", + "silverstripe/asset-admin": "1.2.4@stable", + "silverstripe/campaign-admin": "1.2.4@stable", + "silverstripe/cms": "4.2.4@stable", + "silverstripe/errorpage": "1.2.4@stable", + "silverstripe/graphql": "2.0.4@stable", + "silverstripe/reports": "4.2.4@stable", + "silverstripe/siteconfig": "4.2.4@stable", + "silverstripe/versioned": "1.2.4@stable" }, "require-dev": { "phpunit/PHPUnit": "^5.7" From a8a3091d74cb3eb067b888d7804ca4c993092445 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 19 Feb 2019 05:22:13 +0700 Subject: [PATCH 4/4] Revert "Update development dependencies" This reverts commit 7952bee96186062c3667939839da85a8d50dafda. --- composer.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 09e630c..32f8c34 100644 --- a/composer.json +++ b/composer.json @@ -6,16 +6,16 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-core": "4.2.4@stable", - "silverstripe/admin": "1.2.4@stable", - "silverstripe/asset-admin": "1.2.4@stable", - "silverstripe/campaign-admin": "1.2.4@stable", - "silverstripe/cms": "4.2.4@stable", - "silverstripe/errorpage": "1.2.4@stable", - "silverstripe/graphql": "2.0.4@stable", - "silverstripe/reports": "4.2.4@stable", - "silverstripe/siteconfig": "4.2.4@stable", - "silverstripe/versioned": "1.2.4@stable" + "silverstripe/recipe-core": "4.2.x-dev", + "silverstripe/admin": "1.2.x-dev", + "silverstripe/asset-admin": "1.2.x-dev", + "silverstripe/campaign-admin": "1.2.x-dev", + "silverstripe/cms": "4.2.x-dev", + "silverstripe/errorpage": "1.2.x-dev", + "silverstripe/graphql": "2.0.x-dev", + "silverstripe/reports": "4.2.x-dev", + "silverstripe/siteconfig": "4.2.x-dev", + "silverstripe/versioned": "1.2.x-dev" }, "require-dev": { "phpunit/PHPUnit": "^5.7"