Revert composer.lock addition, unclear usage, breaks builds
Partially reverts e9f13512dc
This caused two issues in Travis builds:
* CMS builds were using
outdated framework dependencies. Example: https://travis-ci.org/silverstripe/silverstripe-cms/jobs/7718686
* Modules weren't building
at all because the info in the lock file overwrote the custom
composer.json. Example: https://travis-ci.org/silverstripe/silverstripe-translatable/jobs/7726954
In addition, I don't agree with having lock files on release branches
(as opposed to tags), since it forces us to permantently update lock
files or work with stale dependencies even when on branches
(most likely not the developers intention).
This commit is contained in:
Ingo Schommer
parent
e9f13512dc
commit
93f206a125
|
|
@ -1,226 +0,0 @@
|
|||
{
|
||||
"_readme": [
|
||||
"This file locks the dependencies of your project to a known state",
|
||||
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
|
||||
],
|
||||
"hash": "351c3c25e8ad3f3e9bec6672374d4746",
|
||||
"packages": [
|
||||
{
|
||||
"name": "composer/installers",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/composer/installers.git",
|
||||
"reference": "3e3c4ace757bd7b9d11b9dc6b7fd2f4ef57dc8c1"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/composer/installers/zipball/3e3c4ace757bd7b9d11b9dc6b7fd2f4ef57dc8c1",
|
||||
"reference": "3e3c4ace757bd7b9d11b9dc6b7fd2f4ef57dc8c1",
|
||||
"shasum": ""
|
||||
},
|
||||
"replace": {
|
||||
"shama/baton": "*"
|
||||
},
|
||||
"require-dev": {
|
||||
"composer/composer": "1.0.*@dev",
|
||||
"phpunit/phpunit": "3.7.*"
|
||||
},
|
||||
"type": "composer-installer",
|
||||
"extra": {
|
||||
"class": "Composer\\Installers\\Installer",
|
||||
"branch-alias": {
|
||||
"dev-master": "1.0-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Composer\\Installers\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Kyle Robinson Young",
|
||||
"email": "kyle@dontkry.com",
|
||||
"homepage": "https://github.com/shama",
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"description": "A multi-framework Composer library installer",
|
||||
"homepage": "http://composer.github.com/installers/",
|
||||
"keywords": [
|
||||
"TYPO3 Flow",
|
||||
"TYPO3 Neos",
|
||||
"agl",
|
||||
"cakephp",
|
||||
"codeigniter",
|
||||
"drupal",
|
||||
"fuelphp",
|
||||
"installer",
|
||||
"joomla",
|
||||
"kohana",
|
||||
"laravel",
|
||||
"li3",
|
||||
"lithium",
|
||||
"mako",
|
||||
"phpbb",
|
||||
"ppi",
|
||||
"silverstripe",
|
||||
"symfony",
|
||||
"wordpress",
|
||||
"zend"
|
||||
],
|
||||
"time": "2013-05-25 02:21:36"
|
||||
},
|
||||
{
|
||||
"name": "silverstripe-themes/simple",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/silverstripe-themes/silverstripe-simple.git",
|
||||
"reference": "0c3bc660a796ffba6e9fbb0da47fe20fa33af3b3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/silverstripe-themes/silverstripe-simple/zipball/0c3bc660a796ffba6e9fbb0da47fe20fa33af3b3",
|
||||
"reference": "0c3bc660a796ffba6e9fbb0da47fe20fa33af3b3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer/installers": "*",
|
||||
"silverstripe/framework": ">=3.0"
|
||||
},
|
||||
"type": "silverstripe-theme",
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"BSD-3-Clause"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Sara Tušar (Innovaif)",
|
||||
"homepage": "http://www.saratusar.com"
|
||||
}
|
||||
],
|
||||
"description": "The SilverStripe simple theme (default SilverStripe 3 theme)",
|
||||
"keywords": [
|
||||
"silverstripe",
|
||||
"theme"
|
||||
],
|
||||
"time": "2013-05-08 06:38:58"
|
||||
},
|
||||
{
|
||||
"name": "silverstripe/cms",
|
||||
"version": "3.0.x-dev",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/silverstripe/silverstripe-cms.git",
|
||||
"reference": "2809b009a17435ac0fa25f5df89a88f316ee517b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-cms/zipball/2809b009a17435ac0fa25f5df89a88f316ee517b",
|
||||
"reference": "2809b009a17435ac0fa25f5df89a88f316ee517b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer/installers": "*",
|
||||
"php": ">=5.3.2",
|
||||
"silverstripe/framework": "3.0.*"
|
||||
},
|
||||
"type": "silverstripe-module",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
"tests/behat/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"BSD-3-Clause"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "SilverStripe",
|
||||
"homepage": "http://silverstripe.com"
|
||||
},
|
||||
{
|
||||
"name": "The SilverStripe Community",
|
||||
"homepage": "http://silverstripe.org"
|
||||
}
|
||||
],
|
||||
"description": "The SilverStripe Content Management System",
|
||||
"homepage": "http://silverstripe.org",
|
||||
"keywords": [
|
||||
"cms",
|
||||
"silverstripe"
|
||||
],
|
||||
"time": "2013-05-25 07:59:08"
|
||||
},
|
||||
{
|
||||
"name": "silverstripe/framework",
|
||||
"version": "3.0.x-dev",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/silverstripe/silverstripe-framework.git",
|
||||
"reference": "f6fbd78cd9c11d5a316335b0dd751a2902e76a0a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/f6fbd78cd9c11d5a316335b0dd751a2902e76a0a",
|
||||
"reference": "f6fbd78cd9c11d5a316335b0dd751a2902e76a0a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"composer/installers": "*",
|
||||
"php": ">=5.3.2"
|
||||
},
|
||||
"type": "silverstripe-module",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
"tests/behat/features/bootstrap"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"BSD-3-Clause"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "SilverStripe",
|
||||
"homepage": "http://silverstripe.com"
|
||||
},
|
||||
{
|
||||
"name": "The SilverStripe Community",
|
||||
"homepage": "http://silverstripe.org"
|
||||
}
|
||||
],
|
||||
"description": "The SilverStripe framework",
|
||||
"homepage": "http://silverstripe.org",
|
||||
"keywords": [
|
||||
"framework",
|
||||
"silverstripe"
|
||||
],
|
||||
"time": "2013-05-25 06:50:41"
|
||||
}
|
||||
],
|
||||
"packages-dev": [
|
||||
|
||||
],
|
||||
"aliases": [
|
||||
|
||||
],
|
||||
"minimum-stability": "dev",
|
||||
"stability-flags": {
|
||||
"silverstripe/cms": 20,
|
||||
"silverstripe/framework": 20
|
||||
},
|
||||
"platform": {
|
||||
"php": ">=5.3.2"
|
||||
},
|
||||
"platform-dev": [
|
||||
|
||||
]
|
||||
}
|
||||
Loading…
Reference in New Issue