Commit Graph

178 Commits

Author SHA1 Message Date
Robbie Averill
e0993043f8 Merge branch '4.1' into 4 2018-05-30 15:08:39 +12:00
Robbie Averill
c8b0bc0ad7 Merge branch '4.0' into 4.1
# Conflicts:
  #	src/ORM/DataObject.php
  #	tests/php/ORM/DataObjectDuplicationTest.php
  #	tests/php/ORM/DataObjectDuplicationTest/Class1.php
2018-05-30 14:52:07 +12:00
Damian Mooyman
1509a12fdf
ENHANCEMENT Only run coverage test as a cron
Fixes #8014
2018-04-19 12:56:54 +12:00
Damian Mooyman
87c7a53511
Merge remote-tracking branch 'origin/4.1' into 4
# Conflicts:
#	.travis.yml
2018-04-13 09:56:58 +12:00
Damian Mooyman
5a8c5601a9
Merge remote-tracking branch 'origin/4.0' into 4.1
# Conflicts:
#	.travis.yml
#	composer.json
2018-04-13 09:55:23 +12:00
Damian Mooyman
c54b07a952
API Update to use new chromedriver + behat-extension + facebook/webdriver 2018-04-12 14:19:14 +12:00
Damian Mooyman
9bfa195e72
Update travis.yml 2018-02-07 17:48:31 +13:00
Damian Mooyman
8d077203d4 API Implement support for public/ webroot folder (#7741)
* API Implement support for public/ webroot folder

* Bugfixes and refactor based on feedback
2018-01-12 16:25:02 +13:00
Christopher Joe
aff4babfa5 Feature Set .gitattributes to ignore docs and tests folder, and some source asset files which are not needed 2017-12-14 15:17:56 +13:00
Daniel Hensby
eb55c27124
Merge branch '4.0' into 4 2017-12-05 12:14:22 +00:00
Daniel Hensby
5ee2264bcb
Add PHP nightly builds to travis 2017-11-30 17:40:17 +00:00
Damian Mooyman
4b90821ef5
Update travis to recipe 1.1 2017-11-27 16:04:06 +13:00
Damian Mooyman
fba33ad2e0
Remove imagick install 2017-11-09 11:52:44 +13:00
Damian Mooyman
04b4596bec ENHANCEMENT Don't fail immediately on imagick install 2017-10-20 11:04:59 +13:00
Damian Mooyman
cc99b2ec19 Implement recommended pecl channel-update 2017-10-09 17:16:35 +13:00
Ingo Schommer
f6ce07dc88 Fix behat bootstrap path 2017-10-04 08:12:37 +01:00
Damian Mooyman
1b6d0144c5
BUG Fix resource mapping for TinyMCE
API add ModuleResource::getRelativeResource()
2017-10-04 17:44:04 +13:00
Damian Mooyman
85255891be
Fix test environment type 2017-10-02 17:13:00 +13:00
Ingo Schommer
51153e8b52 Pin firefox version 2017-09-12 15:59:01 +12:00
Ingo Schommer
81097f34b1 Move to travis trusty dist
See https://github.com/silverstripe/silverstripe-framework/pull/7092 for context.
2017-09-12 15:21:10 +12:00
Damian Mooyman
806ffb934e
BUG Ensure installer.php works nicely with .env files
Unenjoyable cleanup of internal logic
2017-09-06 13:52:51 +12:00
Damian Mooyman
2c34af72e1
ENHANCEMENT Log user constants during CI for debugging improvements 2017-08-23 14:23:33 +12:00
Sam Minnee
0eebeedd03 NEW: Test php 7.2
Travis now supports PHP 7.2 testing, and we should add this to our suite
so that SilverStripe 4 can be released with PHP 7.2 support.

PHP 7.2 is due for released in November, a little after when SS4 is
expected to go stable.
2017-08-15 11:06:37 +12:00
Daniel Hensby
92bc069b58
only save composer cache 2017-07-26 17:36:39 +01:00
Daniel Hensby
ecca05cc7f
Add caching to travis 2017-07-26 17:16:21 +01:00
Daniel Hensby
1046065625
Only install deps once we have a final set of requirements 2017-07-26 17:16:20 +01:00
Daniel Hensby
884f53e0f2
Merge branch '3' into 4 2017-07-25 16:17:44 +01:00
Daniel Hensby
fc35eff13f
Merge branch '3.5' into 3.6 2017-07-25 16:02:56 +01:00
Daniel Hensby
ba8c149b78
Stay on travis precise dist for now 2017-07-25 16:02:02 +01:00
Damian Mooyman
d5ab45990d Lock travis to precise 2017-07-21 22:21:14 +12:00
Daniel Hensby
cd28dbef06
TEST Make travis install codesniffer with composer global 2017-07-20 15:12:14 +01:00
Robbie Averill
8b12e97d7a FIX Enable code coverage builds with phpdbg and 7.1.7
PHP 7.1.7 is currently not segfaulting when generating coverage reports with phpdbg
2017-07-18 21:56:21 +12:00
Damian Mooyman
267d7ebfc4
Temporarily restrict php-webdriver to 1.4.3
Add composer.lock to artifacts
See https://github.com/instaclick/php-webdriver/pull/79
2017-06-30 12:35:01 +12:00
Damian Mooyman
0200e2b62a
BUG Fix travis artifacts paths 2017-06-30 10:05:20 +12:00
Sam Minnee
07913e6df6 MINOR: Drop dual MYSQL/PGSQL builds for PHP7
We can get away with testing MySQL on PHP 5.6
and PHP 7.1 and testing PGSQL on PHP 7.0. We don’t
need a full matrix.
2017-06-28 16:57:20 +12:00
Sam Minnee
1fa712e189 MINOR: More PHP7 in travis builds
PHP7 is faster than PHP5.6 so we should use it for as many builds
as possible.

This leaves 1 build - the coverage build - running on PHP5.6
and puts the rest on PHP7.
2017-06-28 16:51:41 +12:00
Damian Mooyman
e945ea64b5 Temporarily switch to composer 1.5 2017-05-23 13:50:35 +12:00
Damian Mooyman
942c0257b7 API Upgrade to behat 3 2017-05-05 14:32:07 +12:00
Damian Mooyman
f2768c85b1 API Enable namespaced-localisation keys in templates
BUG Fix whitespaces in SSTemplateParser.peg
2017-04-11 18:07:53 +12:00
Loz Calver
40bf945322 NEW: PHP 7 compatibility
This patch introduces PHP 7 compatability without breaking semver by adding DBInt
and DBFloat classes, with Int/Float classes that are only loaded into PHP 5 environments
2017-04-05 11:00:04 +10:00
Damian Mooyman
6cfeb7f07e
Update test configuration
Note: Retains CMS build
2017-04-05 10:15:48 +12:00
Ingo Schommer
d1c4f7fcf4 Add campaign-admin to CMS_TEST=1 on travis
We want to remove this implicit dependency (through cms)
by fully decoupling campaign-admin (https://github.com/silverstripe/silverstripe-campaign-admin/issues/1),
but for now this is required.
2017-03-29 08:43:04 +13:00
Damian Mooyman
ac3a9c9e6e API Split out SilverStripe\ORM\Versioned into new module 2017-03-27 11:03:39 +13:00
Daniel Hensby
bcb9a99e54
increase memory in a hope to get code coverage working 2017-03-24 17:05:53 +13:00
Damian Mooyman
dae6d5902f API Split SilverStripe\Assets into separate module 2017-03-21 11:12:51 +13:00
Ingo Schommer
cb5b7537dc Remove composer self-update, handled by Travis now 2017-03-20 10:34:43 +13:00
Ingo Schommer
6e58408806 Drop PHP 5.5 support, limit PHP 5.6 to 2018
Fixes #6705
2017-03-20 10:34:24 +13:00
Damian Mooyman
66b1c72d4a
Fix dev CI builds
Move silverstripe/config release responsibility to installer
Remove admin artifacts in composer.json
2017-03-16 16:08:30 +13:00
Ingo Schommer
1222231da9 Removed NPM-based travis tests 2017-03-15 11:10:04 +13:00
Damian Mooyman
9f953770f5 API Move CMSPreviewable to framework module
Remove or soft-link dependency on admin module
2017-03-14 10:22:45 +13:00