Commit Graph

138 Commits

Author SHA1 Message Date
Damian Mooyman 7b6f62968c Set reports and siteconfig version dependency 2015-06-18 11:41:59 +12:00
Damian Mooyman 750c02c15c Alias 3 as 3.3 2015-06-18 11:25:37 +12:00
Damian Mooyman a9d4bef2a4 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	composer.json
2015-06-02 20:22:11 +12:00
Christopher Pitt f04263d5da Added phpunit to dev dependencies 2015-02-26 14:29:38 +13:00
Christopher Pitt 5d5e614b38 Added phpunit to dev dependencies 2015-02-26 14:21:47 +13:00
Damian Mooyman 133e9d0332 Fix alias for 3.2 2014-11-20 17:24:51 +13:00
Damian Mooyman 46fb50b4be Update branch alias for master 2014-11-20 17:19:24 +13:00
Damian Mooyman d1a090610e Update branch alias for 3 2014-11-20 17:19:04 +13:00
Sean Harvey 24892c6b66 Merge branch '3.1' 2013-07-30 14:43:37 +12:00
Sean Harvey 8be1dea481 Fixing regression in composer post scripts
Fixes regression on Windows where composer update and composer install because the path is hardcoded to only work on *nix systems.
2013-07-26 18:58:07 +12:00
Ingo Schommer 26ec73fde8 Fixed composer.json (merge error) 2013-06-02 20:38:13 +02:00
Ingo Schommer 6b8192e7bd Merge remote-tracking branch 'origin/3.1'
Conflicts:
	composer.json
2013-05-31 18:10:15 +02:00
Sam Minnee 26147bb962 NEW: Added post-install and post-update dev/build call.
With this change, composer will automatically call dev/build after an update or install
command.  The main reason that this is 3.1-only is that previous releases would have
necessitated the use of 'sudo -u www-data', which is too environment-specific.

One thing that this may cause problems with is 'composer create-project' in an environment
without a _ss_environment file.  It will call dev/build, and dev/build will throw an
error.  That should be fixed in a subsequent commit.
2013-05-30 16:23:35 +12:00
Sam Minnee bf81f0394a FIX: Put self.version in composer dependencies.
Now that https://github.com/composer/composer/pull/1883 is in Composer, self.version
will work as a requirement for framework & cms.  This will simplify the release
process a great deal.

Ultimately, the release of rc1 will be the place to test that, but it seems appropriate
to get this in there for that.

If it succeeds with 3.1-rc1, I'd suggest we backport to 3.0 and 2.4.
2013-05-13 21:07:57 +12:00
Ingo Schommer b23c744f41 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-09 16:55:44 +02:00
Ingo Schommer 345a32ec3e Remove require-dev section, composer doesn't handle it well
Any "composer require <module>" call will first call
a "composer update". This *automatically* includes dev requirements,
without providing a way to turn off this behaviour.
A workaround would be "composer require --no-update <module> && composer update --no-dev <module>",
but that drastically reduces the usefulness of the command
for our target audience (moderately technical devs).

In the end, the small faction of devs needing the dev dependencies
also know how to install them on their own. And having a local phpunit
build actually gets in the way more than it helps in case you have
it installed through PEAR already (can get really weird when using the
PEAR provided "phpunit" binary, but the autoloader finds the composer managed classes).
2013-05-07 10:51:47 +02:00
Ingo Schommer 41761472b2 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	composer.json
2013-03-08 10:54:49 +01:00
Will Rossiter 3c88359698 Include a higher timeout value to avoid timeouts.
Checking out framework can often take longer than the default
(300 seconds). This gives a 10min limit to creating a new project.
2013-03-06 20:22:48 +13:00
Ingo Schommer 4e885dd297 Forcing stable flags for release 2013-02-20 01:44:23 +01:00
Ingo Schommer 494bfc7863 Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	build.xml
	composer.json
	install.php
	phpunit.xml.dist
2013-02-15 19:19:23 +01:00
Ingo Schommer 972af938f5 Updated composer.json 2012-12-11 18:01:38 +01:00
Ingo Schommer 40b536654e Updated composer.json 2012-12-11 18:00:47 +01:00
Ingo Schommer 694f3ff350 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	composer.json
2012-12-11 02:04:34 +01:00
Ingo Schommer 52590b9019 Removed @stable tags from release branch
Same as 3.0.x-dev, they're only relevant for tags,
not for branches.
2012-12-07 00:42:44 +01:00
Ingo Schommer fbc03f1fe2 Removed @stable flags from composer.json (release tag only)
They used to require manual editing of the composer.json
file in order to do a proper dev checkout. In the end,
the choice between release tag and dev branch should
be handled by composer already via the --stability flag.
2012-12-07 00:31:42 +01:00
Ingo Schommer 7d6c43e821 Added 'buildtools' to dev requirements in composer 2012-12-07 00:29:57 +01:00
Ingo Schommer 9c254cd72b Added @stable markers to composer.json 2012-12-05 01:10:13 +01:00
Sam Minnee c80265981e Relaxed composer version requirements so that stable releases can be created.
Note that once sapphire, cms, and framework actually provide a stable version, '@stable' should put onto the end of the relevant require clauses.
2012-12-04 11:17:55 +13:00
Ingo Schommer 35cb3e97cd Merge remote-tracking branch 'origin/3.0' 2012-11-27 11:57:11 +01:00
Hamish Friedlander ba56e6cd99 Merge changes for 3.0.3 release into 3.0 2012-11-26 15:59:02 +13:00
Hamish Friedlander fbaab96324 FIX Avoid using self.version in composer.json
When using create-project, self.version doesnt work - the checkout looses the reference to the version
Fix by explicity referencing the version instead
2012-11-26 11:48:06 +13:00
Ingo Schommer 8e074cdfee Added silverstripe/behat-extension to require-dev 2012-11-18 11:42:10 +01:00
Ingo Schommer 47b839db79 Remove compass dependency, too slow even for development at the moment
Use compass on CLI instead, or re-add the module manually
via "composer require".

See https://github.com/silverstripe-labs/silverstripe-compass/issues/9
2012-11-16 00:16:48 +01:00
Ingo Schommer 04ce08b886 Require PHPUnit as dev dependency through Composer 2012-11-15 16:02:57 +01:00
Ingo Schommer 157a275855 Removed custom repo sources from composer.json
We now own the packagist.org repos, no need for manual pointers.
2012-11-08 14:02:28 +01:00
Sam Minnee 71b8b65858 NEW: Added dev dependencies to composer.
FIX: Don't hardcode framework and cms version in installer.
2012-11-04 21:24:59 +13:00
Ingo Schommer 0f83cfc33d Removed custom repo sources from composer.json
We now own the packagist.org repos, no need for manual pointers.
2012-11-01 18:29:16 +01:00
Ingo Schommer 6d7a0f59e7 Added composer.json
Once we've sorted out packagist listing ownership,
we should be able to remove the custom repository entries.
2012-11-01 17:26:18 +01:00