Commit Graph

132 Commits

Author SHA1 Message Date
Sam Minnee 11b8926c1a fixup - prefer-stable necessary to avoid armageddon 2017-05-05 17:19:41 +12:00
Sam Minnee e2271d1b0a fixup - make behat work 2017-05-05 17:19:41 +12:00
Sam Minnee f4179d608d NEW: Simplify test runs. 2017-05-05 17:19:41 +12:00
Damian Mooyman df100b8798 API Upgrade to behat 3 2017-05-05 17:19:41 +12:00
Ingo Schommer 904f18cc48 Pin PHP7 build to 7.1.2
7.1.3 breaks with segfaults: https://travis-ci.org/silverstripe/silverstripe-cms/jobs/220828001

Same fix as framework: 6cfeb7f07e
2017-04-12 08:43:36 +12:00
Ingo Schommer 53b4c779f2 Merge branch 'master' into pulls/4/code-cov-after-success 2017-04-12 08:12:14 +12:00
Ingo Schommer fb0c69f877 Only git-diff files in client folder
We only care about the dist files. If we diff in the root folder,
we'll get false positives on composer.json changes.

See https://travis-ci.org/silverstripe/silverstripe-cms/jobs/215796957
2017-03-28 19:30:38 +13:00
Damian Mooyman 5ce98aced2 API Upgrade to rely on silverstripe/versioned module 2017-03-28 10:35:14 +13:00
Ingo Schommer d95be0e273 Remove composer self-update, handled by Travis now 2017-03-20 20:06:18 +13:00
Ingo Schommer 7dfa6fc21c Drop PHP 5.5 support
See https://github.com/silverstripe/silverstripe-framework/issues/6705#issuecomment-287515832
2017-03-20 20:06:18 +13:00
Damian Mooyman bd409bfd30
BUG Fix PHPUNIT_COVERAGE_TEST by moving to php 5 build 2017-03-13 15:48:16 +13:00
Daniel Hensby fd987a6360
Run code coverage upload after success 2017-02-08 12:42:04 +00:00
Damian Mooyman a80b8aef60 Lint php coding standards via CI 2017-01-31 15:12:25 +13:00
Daniel Hensby 90b6c9d942
CI Check dist files are correctly built 2017-01-30 20:23:52 +00:00
Robbie Averill 6759f5a135 BUILD Run PHP 7.1 as default 7.x 2016-12-30 00:49:38 +13:00
Daniel Hensby 36900a651b
Updating travis.yml 2016-12-28 17:57:21 +00:00
Daniel Hensby 7a296a541b
Merge branch '3' 2016-12-28 17:00:32 +00: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
Ingo Schommer 0d788ddfbc NEW: Code Coverage via CodeCov.io (#1631)
* Add phpunit.xml.dist for code coverage whitelist
* Fixed @covers with namespaces
* Increase memory_limit to allow code coverage run. phpdbg can peak to more than 1GB built-in.

Travis allows up to 3GB of useable memory:
https://docs.travis-ci.com/user/common-build-problems/#My-build-script-is-killed-without-any-error
https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments

https://github.com/silverstripe/silverstripe-cms/pull/1631
2016-11-21 15:17:25 +13:00
Damian Mooyman 02b9de93c3
Increment 3 alias to 3.6 2016-11-14 10:05:34 +13:00
Sam Minnee added2129f NEW: Simplified travis run
Travis no longer relies on travis-support or special project structures.
Instead, behat and silverstripe-serve are provided as dev dependencies
and used within a normal composer install structure.

tests/fixtures/Page.php should be copied into the project root before
a test run. .travis.yml does this.
2016-10-28 17:47:21 +13:00
Ingo Schommer ec66912bc0 Use sass-lint
See https://github.com/silverstripe/silverstripe-framework/pull/6016
2016-09-27 17:10:47 +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
Damian Mooyman d7d6fd8758 Merge 3 into master
# Conflicts:
#	code/controllers/CMSPageAddController.php
#	code/model/ErrorPage.php
#	composer.json
#	css/screen.css
#	tests/behat/features/insert-a-link.feature
2016-04-29 14:34:29 +12: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
Damian Mooyman db6251a9b7 API Update to use new travis-artifacts 2016-04-05 13:49:56 +12: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
Sam Minnee 46b35ecb0e FIX: Changes to support php7 and new DBFields
These changes are necessary for CMS to work with this API breakage:
https://github.com/silverstripe/silverstripe-framework/pull/4551
2016-03-23 10:05:05 +13:00
Ingo Schommer 397f9670b5 Fixed core release constraint in travis.yml 2016-03-04 16:57:49 +13:00
Ingo Schommer 8f2e486dc5 Forcing Behat 2.x dependency
Due to `"prefer-stable": true`, composer will use the 1.0.0 release which had a wrong dependency constraint (not limited to 3.x). It's too early to tag behat-extension 2.0.0 already in terms of semver - so we opt for installing the 2.x dev version instead.
2016-02-24 23:50:48 +13:00
Damian Mooyman 7dfe145412 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	code/controllers/CMSFileAddController.php
#	code/controllers/CMSPageAddController.php
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/CMSSiteTreeFilter.php
#	code/controllers/ContentController.php
#	code/controllers/LeftAndMainPageIconsExtension.php
#	code/controllers/SilverStripeNavigator.php
#	code/model/SiteTreeFileExtension.php
#	code/model/VirtualPage.php
#	composer.json
#	tests/model/ErrorPageTest.yml
#	tests/model/FileLinkTrackingTest.yml
#	tests/model/VirtualPageTest.yml
2016-01-20 13:16:43 +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
Ingo Schommer d9b5895ee3 Increase minimum required PHP version to 5.5
See mailinglist discussion at https://groups.google.com/forum/#!topic/silverstripe-dev/7mVvhNNeNps
2015-10-22 22:13:14 +13:00
Damian Mooyman 60e75cbd99 Fix travis php version back to 5.4 2015-09-09 17:46:57 +12:00
Damian Mooyman e68a752ac7 Merge remote-tracking branch 'origin/3'
Conflicts:
	.travis.yml
2015-09-09 14:53:48 +12: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 f81159c2f7 Removing PHP 5.3 from travis 2015-08-17 17:30:48 +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
Damian Mooyman 3790273ae7 Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
2015-07-31 15:49:46 +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 dd49a888e8 Merge remote-tracking branch 'origin/3' 2015-06-17 15:54:01 +12: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
Ingo Schommer 74a44933b2 Excluded Postgres from Travis (breaks build due to internal errors)
We'll need to fix the "no space left on device" issue,
most likely caused by Postgres keeping too much of a query log,
or somehow creating a history of past data.
For now, having a Postgres build breaking the whole
build process (incl. MySQL builds) does more harm than good.
2013-01-30 13:07:38 +01:00
Ingo Schommer 8d5cea550c TRAVIS_BRANCH doesn't seem to be set in before_script, hardcoding 2012-11-23 16:31:51 +01:00
Ingo Schommer b42cb5c308 Passing through $TRAVIS_BRANCH to before_script 2012-11-23 16:10:07 +01:00
Ingo Schommer 6eb597a2d5 Fixed travis.yml paths 2012-11-21 14:03:04 +01:00
Ingo Schommer 65793e2b38 Added travis support 2012-11-09 13:07:23 +01:00
Ingo Schommer d298ec9bc1 Blacklisting further travis branches 2012-10-16 10:24:18 +02:00
Simon Welsh 38f28deafe Adds Travis testing to the CMS 2012-09-27 13:00:49 +12:00