Commit Graph

16 Commits

Author SHA1 Message Date
Ingo Schommer
56f7ce1dcf Merge remote-tracking branch 'origin/3.0'
Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php
2012-10-03 16:16:19 +02:00
Sam Minnee
b7e7c165ff NEW Amend Travis build to run a simple PHP_CodeSniffer test.
At this stage, the test just checks line-length and line-endings, but previous commits have ensured that framework actually passes those tests.  We can add more tests as we actually correct the code to pass those tests, and grow the test suite, as we had for unit tests.
2012-09-30 17:28:46 +13:00
Ingo Schommer
6544c8fc13 Merge remote-tracking branch 'origin/3.0' 2012-09-11 14:05:45 +02:00
Sam Minnee
697d3dbd69 Removed SQLite from Travis build.
We don't currently use SQLite for any production deploys, and testing every build against it is overkill.
I'm removing this to be a bit nicer to the Travis servers; if we start relying more on SQLite's performance
in the future we can always revert this commit.
2012-09-11 12:26:59 +12:00
Ingo Schommer
1088d044c5 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	.travis.yml
2012-09-07 17:21:41 +02:00
Sam Minnee
540f23842f Added IRC notifications to Travis 2012-09-03 13:20:11 +12:00
Sam Minnee
abbce151d9 Updated Travis-CI configuration to have a 4 build grid.
The Travis config will now run tests on the following instances

 * 5.3 + SQLite
 * 5.3 + MySQL
 * 5.3 + PostgreSQL
 * 5.4 + MySQL

In other words, with the exception of Windows tech (MSSQL + Win server) this is a wide-coverage build config.
2012-08-28 16:25:26 +12:00
Sam Minnee
cbdc3bf896 Fixed bug in Travis matrix definition 2012-08-21 14:41:12 +12:00
Sam Minnee
597bc080ff Fixed bug in Travis exclusion of 5.4/SQlite and 5.4/PostgreSQL 2012-08-21 14:34:21 +12:00
Sam Minnee
9f4fb1353e Added PHP 5.4 + MySQL to build grid 2012-08-21 10:51:28 +12:00
Sam Minnee
866d9a94ee Updated Travis-CI configuration to have a 3 database build grid. 2012-08-21 10:42:34 +12:00
Sam Minnee
e51937f1e8 Exclude a few branches from running in Travis 2012-08-17 09:55:20 +12:00
Sam Minnee
b9522114f5 Fixed bugs in Travis CI set-up 2012-08-14 17:02:06 +12:00
Sam Minnee
50b4d805cc Fixed bugs in Travis CI set-up 2012-08-14 16:11:37 +12:00
Sam Minnee
8d92046769 Added support for Travis CI 2012-08-14 16:06:21 +12:00
Sam Minnee
04e3beddf5 Added support for Travis CI 2012-08-14 16:02:12 +12:00