Update composer, composer will handle git pull, no need for manual git pull

This commit is contained in:
DariusIII
2016-04-25 19:56:54 +02:00
parent 4e0a628001
commit 97599dec7f
4 changed files with 16 additions and 9 deletions
+1
View File
@@ -1,4 +1,5 @@
2016-04-25 DariusIII
* Upd: Update composer, composer will handle git pull, no need for manual git pull
* Fix: Fix populate_rt_indexes script
* Add: Add empty file and create resources/smarty/templates_c
2016-04-20 DariusIII
+3 -2
View File
@@ -102,9 +102,9 @@ class Update extends \app\extensions\console\Command
public function nntmux()
{
try {
$this->git();
//$this->git();
$this->composer();
$this->db();
//$this->db();
$smarty = new Smarty();
$cleared = $smarty->clearCompiledTemplate();
@@ -145,6 +145,7 @@ class Update extends \app\extensions\console\Command
if (in_array($this->gitBranch, $this->git->getBranchesStable())) {
$command .= ' --no-dev';
}
$this->primary('Running composer install process...');
passthru($command);
}
+5
View File
@@ -91,5 +91,10 @@
"unionofrad/manual": "1.1.x-dev",
"unionofrad/li3_quality": "1.1.x-dev"
},
"scripts": {
"pre-install-cmd": "./nntmux update git",
"post-install-cmd": "./nntmux update db"
},
"type": "project"
}
Generated
+7 -7
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "c2c9ec766db4e1fe4401d7955cb4281e",
"hash": "645fd3508984ec45c9cbbb5a6c47896d",
"content-hash": "47c570fd3ae76742162d0e11d9cf8fae",
"packages": [
{
@@ -901,16 +901,16 @@
},
{
"name": "fxp/composer-asset-plugin",
"version": "v1.1.3",
"version": "v1.1.4",
"source": {
"type": "git",
"url": "https://github.com/francoispluchino/composer-asset-plugin.git",
"reference": "62d2cdc302de2534f3985a1a2f5d4a783de4a5eb"
"reference": "c3d803cc890fad5a7fb61a4036c5d973faae34af"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/francoispluchino/composer-asset-plugin/zipball/62d2cdc302de2534f3985a1a2f5d4a783de4a5eb",
"reference": "62d2cdc302de2534f3985a1a2f5d4a783de4a5eb",
"url": "https://api.github.com/repos/francoispluchino/composer-asset-plugin/zipball/c3d803cc890fad5a7fb61a4036c5d973faae34af",
"reference": "c3d803cc890fad5a7fb61a4036c5d973faae34af",
"shasum": ""
},
"require": {
@@ -918,7 +918,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"composer/composer": "~1.0@dev"
"composer/composer": "^1.0.0"
},
"type": "composer-plugin",
"extra": {
@@ -953,7 +953,7 @@
"npm",
"package"
],
"time": "2016-04-01 15:27:16"
"time": "2016-04-22 08:48:58"
},
{
"name": "giantbomb/giantbomb",