Damian Mooyman
0103b076c3
Merge remote-tracking branch 'origin/3'
...
Conflicts:
forms/Form.php
model/ManyManyList.php
2015-06-17 15:41:13 +12:00
Damian Mooyman
0abacaead6
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/LeftAndMain.php
forms/EmailField.php
forms/Form.php
forms/HeaderField.php
forms/LiteralField.php
forms/PasswordField.php
forms/TextareaField.php
forms/TreeDropdownField.php
model/DataObject.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
Daniel Hensby
96c14bd7bf
Make travis more resilient to composer self-update
...
`composer self-update` has been failing regularly on travis recently.
As `composer` is already installed and it's not strictly essential to have the very latest version, this change allows the build to continue, even if composer can't self-update
2015-06-12 19:41:24 +01:00
Damian Mooyman
786b1dd5d4
Merge remote-tracking branch 'origin/3'
...
Conflicts:
control/HTTPRequest.php
filesystem/Upload.php
model/ManyManyList.php
2015-06-09 11:10:14 +12:00
Damian Mooyman
8331171f2c
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
.scrutinizer.yml
admin/javascript/LeftAndMain.Panel.js
core/startup/ParameterConfirmationToken.php
dev/Debug.php
dev/FixtureBlueprint.php
docs/en/00_Getting_Started/05_Coding_Conventions.md
docs/en/00_Getting_Started/index.md
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
filesystem/File.php
filesystem/Folder.php
forms/FieldList.php
forms/LabelField.php
forms/MoneyField.php
forms/TextField.php
forms/TreeDropdownField.php
forms/Validator.php
forms/gridfield/GridField.php
forms/gridfield/GridFieldExportButton.php
lang/de.yml
lang/fi.yml
model/DataObject.php
model/SQLQuery.php
parsers/ShortcodeParser.php
security/ChangePasswordForm.php
security/Security.php
tests/control/DirectorTest.php
tests/core/startup/ParameterConfirmationTokenTest.php
tests/dev/FixtureBlueprintTest.php
tests/forms/FieldListTest.php
tests/forms/MoneyFieldTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
Daniel Hensby
069bf40f34
Test against php 7
2015-05-12 11:12:47 +01:00
Damian Mooyman
ece28cc629
Unreference master version
2014-12-05 10:53:13 +13:00
Damian Mooyman
0b1f297873
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Damian Mooyman
3cfb285122
Reformat .travis.yml
2014-08-22 13:49:10 +12:00
Sean Harvey
03c7231fcd
Fixing HHVM builds not having tidy support built-in to PHP ( #3414 )
...
Installs cli tidy, which is used as a fallback for CSSContentParser.
2014-08-22 11:41:51 +12:00
Tobias Nyholm
9476b22409
Added HHVM to .travis.yml
2014-08-18 21:16:30 +10:00
Damian Mooyman
b0239f4330
BUG Fix PDOConnector issues
...
Travis support for PDO
ATTR_EMULATE_PREPARES = false breaks some test cases
Enable username sans password
Remove unnecessary semicolons delimiting queries
2014-08-01 18:17:51 +12:00
Simon Welsh
c14d58f585
Merge branch '3.1'
...
Conflicts:
.travis.yml
model/ManyManyList.php
model/fieldtypes/DBField.php
2014-07-16 21:24:02 +10:00
Simon Welsh
6874e44179
Remove PHP 5.6 from allowed failures
...
PHP5.6 is due for release rather soon, so we should be ready for it
2014-06-28 08:57:24 +10:00
Damian Mooyman
e9c3ff933f
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
composer.json
2014-05-06 10:22:09 +12:00
Will Morgan
bec8927a08
BUG Allow PHPUnit installation with composer / Fix travis
2014-05-02 18:22:04 +12:00
Simon Welsh
48f65669c8
Change PHP 5.6 to an allowed failure
2014-05-02 15:24:51 +10:00
Simon Welsh
8f31352039
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2014-03-16 09:36:48 +13:00
Simon Welsh
eca35c473c
Add PHP 5.6 to Travis
2014-03-13 20:47:52 +13:00
Ingo Schommer
25b6175e67
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
forms/FormField.php
2013-10-20 13:52:56 +02:00
Ingo Schommer
472bb4d2e2
Running Behat tests on PHP 5.4 (needs integrated webserver)
2013-10-16 14:51:40 +02:00
Ingo Schommer
156140340b
Regression in travis.yml ($WEBROOT undefined, matrix broken)
2013-10-16 14:47:35 +02:00
Ingo Schommer
98f79172a4
Running Travis+Behat through Selenium, save artifacts
2013-10-16 14:01:14 +02:00
Ingo Schommer
d485faf0c9
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
forms/Form.php
2013-10-08 11:17:06 +02:00
Ingo Schommer
cd8eb646a7
Skip @assets and @todo in Travis behat
2013-10-07 22:55:24 +02:00
Sam Minnee
00d1c3f0e9
Proof-of-concept of running Firefox Behat in Travis-CI
2013-10-04 16:48:34 +13:00
Simon Welsh
fbce9fd7cd
Merge branch '3.1'
...
Conflicts:
.travis.yml
docs/en/misc/contributing/code.md
javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00
Simon Welsh
d844c74e3c
Merge branch '3.0' into 3.1
...
Conflicts:
.travis.yml
control/HTTP.php
email/Mailer.php
tests/control/HTTPTest.php
2013-07-05 10:17:14 +12:00
Simon Welsh
fb457e47eb
Removes PHP 5.5 from allowed failures
2013-07-05 09:45:30 +12:00
Ingo Schommer
2845f76ade
PHP 5.5 CI, don't allow failures for sqlite3 and postgres
2013-07-04 22:55:49 +02:00
Simon Welsh
a5310080f6
Removes PHPCS env from Travis build
2013-05-23 19:05:46 +12:00
Sam Minnee
d97ca43cd0
Merge branch '3.1'
...
Conflicts:
README.md
dev/install/install.php5
forms/ConfirmedPasswordField.php
tests/forms/FormTest.php
2013-05-23 19:01:58 +12:00
Sam Minnee
738581f0f5
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
.travis.yml
2013-05-23 18:59:34 +12:00
Simon Welsh
b9d5f27194
Add code-sniffs other than line length to scrutinizer
2013-05-23 10:39:01 +12:00
Ingo Schommer
7803d982bb
Merge remote-tracking branch 'origin/2.4' into 3.0
...
Conflicts:
.travis.yml
composer.json
2013-04-30 00:43:30 +02:00
Ingo Schommer
9ed8eba253
Simplified travis builds (using external script)
2013-03-28 23:49:32 +01:00
Ingo Schommer
b90eafaf14
More straightfoward travis include/exclude
2013-03-28 23:06:30 +01:00
Ingo Schommer
3ff103a04c
More straightfoward travis include/exclude
2013-03-28 22:53:55 +01:00
Ingo Schommer
4da85dc734
Simplified travis builds (external setup scripts)
2013-03-28 22:39:37 +01:00
Ingo Schommer
31f5e00a56
Simplified travis builds (external setup scripts)
2013-03-28 22:24:03 +01:00
Ingo Schommer
05d1305497
Simplified travis builds (external setup scripts)
2013-03-28 22:10:35 +01:00
Andrew Short
94f209eb74
Merge branch '3.1'
2013-03-19 22:36:47 +11:00
Andrew Short
b8a51c3792
Merge branch '3.0' into 3.1
2013-03-19 22:27:09 +11:00
Simon Welsh
2afa568d7e
Mark SQLite as an allowed failure until it works again
2013-03-19 21:45:02 +13:00
Ingo Schommer
ce66bc1eaf
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
tests/travis/before_script
2013-02-27 13:34:03 +01:00
ajshort
9920e5bc45
Update the Travis build versions to 3.1.
2013-02-27 20:36:18 +11:00
ajshort
65b463607e
Update versions used in the Travis build.
2013-02-27 00:40:32 +11:00
ajshort
34d524c09f
Integrate composer in the Travis build process
...
Creates a package definition from the framework version being built,
and uses composer to install it into an installer project, as well
as the required modules for testing.
2013-02-27 00:38:40 +11:00
Ingo Schommer
3dab996c90
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:01:37 +01:00
Ingo Schommer
4f5b3fa3a6
Readd SQlite to travis builds, having it fail harms TDD
2012-12-14 10:40:40 +01:00
