Commit Graph

57 Commits

Author SHA1 Message Date
Garion Herman 600fe51b66 Update Travis config to include PHP 7.4 build 2020-02-27 14:04:16 +13:00
Garion Herman deb80c5370 Upgrade Travis config to trusty
Can't adopt Xenial by default as it doesn't include earlier PHP versions
2020-02-27 13:36:57 +13:00
Robbie Averill 8e871460a8 FIX Give Behat more memory in Travis builds 2018-09-06 12:57:29 +02:00
Daniel Hensby 23d84e6285
Make travis test against 3.x-dev 2018-02-01 17:24:00 +00:00
Daniel Hensby a7d3d82dd7
Stay on travis precise dist for now 2017-07-25 15:56:30 +01:00
Sam Minnee 14540729ca FIX: Use framework 3.5 to test cms 3.5 2017-05-09 11:41:55 +12:00
Daniel Hensby 0b952e277e
Merge branch '3.5' into 3 2016-12-19 11:56:55 +00:00
Daniel Hensby 95995adc98
Move travis env vars out of .travis.yml and into travis CI dashboard 2016-12-06 22:29:48 +00:00
Damian Mooyman 02b9de93c3
Increment 3 alias to 3.6 2016-11-14 10:05:34 +13:00
Jonathon Menz c965133da0 FIX Direct edit file by URL
Trying to navigate directly to the edit view of a file by URL would fail if a folder other than the file’s parent was held in session data. Removed reliance on current ID in session and added folder detection for edit view.
2016-07-29 16:53:31 -07:00
Daniel Hensby af4b546050
Merge branch '3.3' into 3 2016-04-26 01:59:56 +01:00
Daniel Hensby 06d882b49c
Merge 3.2 into 3.3 2016-04-26 01:50:03 +01:00
Ingo Schommer 5f9077242a Disable xdebug on Travis runs
We're not using it for code coverage,
and it's slowing down both composer and phpunit builds.

Recommended by Travis:
https://docs.travis-ci.com/user/speeding-up-the-build/#PHP-optimisations
2016-03-29 17:22:02 +13:00
Ingo Schommer 397f9670b5 Fixed core release constraint in travis.yml 2016-03-04 16:57:49 +13:00
Sam Minnee bbc3aaaf9f MINOR: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:32:05 +13:00
Damian Mooyman b7ad568644 Merge remote-tracking branch 'origin/3.2' into 3 2015-09-09 14:50:28 +12:00
Damian Mooyman f2efbefb8c Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	.travis.yml
2015-09-09 14:09:00 +12:00
Sam Minnee 8a3e84ba1c MINOR: Remove IRC notifications of travis builds.
Companion to https://github.com/silverstripe/silverstripe-framework/pull/4535
2015-08-25 18:12:22 +12:00
Daniel Hensby ab59113612 Fixing core release for travis 2015-08-18 00:09:02 +01:00
Daniel Hensby 4039805ac2 Removing hhvm-nightly as its not supported on travis 2015-08-17 16:53:42 +01:00
Damian Mooyman a6677b1653 API respect custom attributes on OptionsetField and CheckboxSetField
Must be merged with https://github.com/silverstripe/silverstripe-framework/pull/4390
2015-08-03 16:08:56 +12:00
Loz Calver af4150312c Update .travis.yml to match framework 2015-07-24 15:27:13 +01:00
Daniel Hensby 6050cc5403 Move to new travis containerised infrastructure 2015-07-24 11:50:12 +01:00
Daniel Hensby 2408c16b0a Move to new travis containerised infrastructure 2015-07-20 15:54:56 +01:00
Damian Mooyman cc2f3ae603 Merge remote-tracking branch 'origin/3.1' into 3 2015-06-17 10:14:01 +12:00
Daniel Hensby e570d4a726 Updating travis provisioner
Travis will now be more resilient to `composer self-update` failures
2015-06-15 10:03:40 +01:00
Damian Mooyman 2fdf9d7320 Fix CORE_RELEASE 2015-02-20 12:48:27 +13:00
Damian Mooyman d01883a5f8 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	code/model/SiteConfig.php
2014-11-18 12:45:42 +13:00
Sean Harvey 4d0e4b78f4 Reformat .travis.yml 2014-08-22 14:04:50 +12:00
Mateusz Uzdowski 52d297e6ef Merge remote-tracking branch 'origin/3.1' into merge-back
Conflicts:
	code/controllers/CMSSiteTreeFilter.php
	code/controllers/ReportAdmin.php
	code/reports/Report.php
2014-08-13 17:19:01 +12:00
Damian Mooyman fc6f0fecc5 Set minimum firefox version for travis support 2014-08-11 18:26:15 +12:00
Damian Mooyman b3699281c0 Merge remote-tracking branch 'origin/3.1'
Conflicts:
.travis.yml
2014-05-06 10:24:28 +12:00
Damian Mooyman b5214d25a1 Update travis configuration to use composer phpunit
Made PHP 5.6 an allowed failure
2014-05-05 13:14:57 +12:00
Simon Welsh b497b8f548 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	code/reports/Report.php
2014-03-18 09:23:39 +13:00
Simon Welsh 79da34ff6e Add PHP 5.6 to the test matrix 2014-03-13 21:00:10 +13:00
Ingo Schommer 0a1ffd3e1a Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
2013-10-20 13:51:19 +02:00
Ingo Schommer b884671bfb Behat travis tests 2013-10-16 16:11:21 +02:00
Simon Welsh ff18abb994 Merge branch '3.0' into 3.1
Conflicts:
	.travis.yml
2013-07-14 17:24:06 +12:00
Simon Welsh 094039dbc8 Remove PHP 5.5 from allowed failures 2013-07-14 17:21:18 +12:00
Andrew Short 1710958207 Merge branch '3.1'
Conflicts:
	.travis.yml
	code/controllers/ReportAdmin.php
2013-07-09 13:54:05 +10:00
Ingo Schommer 2545f41bdc Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	.travis.yml
2013-07-05 00:22:14 +02:00
Ingo Schommer e194b962db PHP 5.5 CI, don't allow failures for sqlite3 and postgres 2013-07-04 23:01:09 +02:00
Ingo Schommer d7c937710a Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	.travis.yml
	composer.json
2013-05-17 00:38:26 +02:00
Ingo Schommer 8ae58398fe Simplified travis builds (using external script) 2013-03-28 23:48:37 +01:00
Ingo Schommer 88b6d60353 More straightfoward travis include/exclude 2013-03-28 23:07:49 +01:00
Ingo Schommer c62eb05518 More straightfoward travis include/exclude 2013-03-28 22:54:32 +01:00
Ingo Schommer 1e117d22a0 Simplified travis builds (external setup scripts) 2013-03-28 22:36:05 +01:00
Ingo Schommer 36352fdc68 Fixed missing cmd in travis setup 2013-03-28 21:31:27 +01:00
Ingo Schommer b23c9bba82 Simplified travis builds (external setup scripts) 2013-03-28 21:15:11 +01:00
Ingo Schommer f212ebe0f0 Simplified travis builds (external setup scripts) 2013-03-28 21:11:38 +01:00