Commit Graph

66 Commits

Author SHA1 Message Date
Christopher Joe
adca3aea68 Update composer alias 2017-07-06 09:03:09 +12:00
Damian Mooyman
7b68ac77ab Remove obsolete branch-alias 2017-07-03 16:53:55 +12:00
Jono Menz
4f68a04730 Added errorpage module 2017-06-15 16:02:13 -07:00
Damian Mooyman
41c2f8c82e Add campaign admin module 2017-03-28 13:32:45 +13:00
Damian Mooyman
3a1b9a82f5 Add versioned module 2017-03-28 10:35:25 +13:00
Daniel Hensby
d2c8e3c65f
Update PHP min version and PHPUnit version 2017-03-25 00:20:44 +13:00
Damian Mooyman
33087bcc8d Add assets as module 2017-03-23 09:24:14 +13:00
Damian Mooyman
61e5b3836e
Fix dev dependencies for root project 2017-03-16 16:01:15 +13:00
Damian Mooyman
94f3c609b2
Add admin module to root installer 2017-03-10 15:17:14 +13:00
Ingo Schommer
a8572e7b22 Added GraphQL dependency
This is required here in order for the "cow" release tool
to include the module in tagging releases.

At the moment, it's only an indirect asset-admin dependency,
but will become a framework dependency once we switch
CampaignAdmin to use GraphQL as well.
2017-01-17 11:44:33 +13:00
Damian Mooyman
a7ec54cb25 Remove self.version (#138)
Lock dev branches to dev
2016-09-20 10:20:52 +12:00
Robbie Averill
a6f1fa3b91 FIX use 1.0.x-dev for asset-admin composer contraint
* Resolves #131
2016-09-01 08:03:27 +12:00
Martijn van Nieuwenhoven
3687ef8cb3 update required php version
as in framework and cms
2016-05-13 00:01:34 +02:00
Damian Mooyman
639092d333 Merge 3.1 into master
# Conflicts:
#	composer.json
2016-05-11 17:54:40 +12:00
Sam Minnee
70be958cee Revert "Require php-tidy for dev dependencies (#87)"
This reverts commit bb24a9192e.

Fixes https://github.com/silverstripe/silverstripe-installer/issues/120
2016-05-11 17:35:51 +12:00
Damian Mooyman
1a5652d81c Merge 3 into master
# Conflicts:
#	composer.json
2016-05-11 14:33:39 +12:00
Damian Mooyman
4920218155 Merge 3.3 into 3 2016-05-11 14:02:09 +12:00
Damian Mooyman
0a3570808a Merge 3.2 into 3.3 2016-05-11 13:59:52 +12:00
Damian Mooyman
4ba8fda822 Merge 3.1 into 3.2
# Conflicts:
#	composer.json
2016-05-11 13:55:23 +12:00
Daniel Hensby
bb24a9192e Require php-tidy for dev dependencies (#87) 2016-05-08 22:05:19 +12:00
Damian Mooyman
8d2cc913e9 API Include asset-admin module in installer
Requires https://github.com/silverstripe/silverstripe-asset-admin/pull/132
2016-05-03 15:47:17 +12:00
Daniel Hensby
38fa596239 Bumping PHPUnit version 2016-01-25 15:09:58 +00:00
Damian Mooyman
c7327814b5 Alias 3 branch as 3.4 2015-12-23 14:25:24 +13:00
Daniel Hensby
eeec7be996 Merge branch '3' 2015-11-10 10:55:37 +00:00
Daniel Hensby
5e20faa72a Merge remote-tracking branch 'silverstripe/3.2' into 3
Conflicts:
	composer.json
2015-07-20 15:20:19 +01:00
Ingo Schommer
b5a1b91358 Merge remote-tracking branch 'origin/3' 2015-07-16 21:36:29 +12:00
Sam Minnee
ea72c5def0 Prefer stable packages while still allowing dev ones. Fixes #100
Although the original ticket recommended increasing our
minimum-stability, this change gives us the best of both worlds.

 - Where stable packages are available and meet the requirements, they
   will be used.
 - Where stable packages aren’t available or they don’t meet the
   dependency requirements, non-stable packages are still allowed.

As part of this I have also tightened up the silverstripe-themes req
version, as “*” is an anti-pattern. The versioning of the theme has
rightly split off from the versioning of the framework; it looks like
3.1.* is what we should expect.

Arguably, we could set the dependency to ~3.1, but in this case I think
it’s fine to be conservative.
2015-07-03 17:34:58 +01:00
David Alexander
dec0b889ad Updated minimum php version 2015-06-25 12:42:57 +12:00
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