mirror of
https://github.com/hauke68/Magallanes.git
synced 2025-08-26 05:10:17 +02:00
Version 0.9.12.
This commit is contained in:
parent
8ed7dd63c4
commit
c49737d412
@ -16,7 +16,7 @@ class Mage_Command_BuiltIn_Deploy
|
|||||||
{
|
{
|
||||||
$this->getConfig()->setReleaseId(date('YmdHis'));
|
$this->getConfig()->setReleaseId(date('YmdHis'));
|
||||||
$failedTasks = 0;
|
$failedTasks = 0;
|
||||||
|
|
||||||
$this->_startTime = time();
|
$this->_startTime = time();
|
||||||
|
|
||||||
$lockFile = '.mage/' . $this->getConfig()->getEnvironment() . '.lock';
|
$lockFile = '.mage/' . $this->getConfig()->getEnvironment() . '.lock';
|
||||||
@ -73,12 +73,12 @@ class Mage_Command_BuiltIn_Deploy
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->_endTimeHosts = time();
|
$this->_endTimeHosts = time();
|
||||||
|
|
||||||
if ($failedTasks > 0) {
|
if ($failedTasks > 0) {
|
||||||
Mage_Console::output('A total of <dark_gray>' . $failedTasks . '</dark_gray> deployment tasks failed: <red>ABORTING</red>', 1, 2);
|
Mage_Console::output('A total of <dark_gray>' . $failedTasks . '</dark_gray> deployment tasks failed: <red>ABORTING</red>', 1, 2);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Releasing
|
// Releasing
|
||||||
if ($this->getConfig()->release('enabled', false) == true) {
|
if ($this->getConfig()->release('enabled', false) == true) {
|
||||||
// Execute the Releases
|
// Execute the Releases
|
||||||
@ -86,7 +86,7 @@ class Mage_Command_BuiltIn_Deploy
|
|||||||
foreach ($hosts as $host) {
|
foreach ($hosts as $host) {
|
||||||
$this->getConfig()->setHost($host);
|
$this->getConfig()->setHost($host);
|
||||||
$task = Mage_Task_Factory::get('deployment/release', $this->getConfig(), false, 'deploy');
|
$task = Mage_Task_Factory::get('deployment/release', $this->getConfig(), false, 'deploy');
|
||||||
|
|
||||||
if ($this->_runTask($task, 'Releasing on host <purple>' . $host . '</purple> ... ')) {
|
if ($this->_runTask($task, 'Releasing on host <purple>' . $host . '</purple> ... ')) {
|
||||||
$completedTasks++;
|
$completedTasks++;
|
||||||
}
|
}
|
||||||
@ -95,26 +95,29 @@ class Mage_Command_BuiltIn_Deploy
|
|||||||
|
|
||||||
// Execute the Post-Release Tasks
|
// Execute the Post-Release Tasks
|
||||||
foreach ($hosts as $host) {
|
foreach ($hosts as $host) {
|
||||||
Mage_Console::output('Starting <dark_gray>Post-Release</dark_gray> tasks for <dark_gray>' . $host . '</dark_gray>:');
|
if (count($tasksToRun) > 0) {
|
||||||
$this->getConfig()->setHost($host);
|
$this->getConfig()->setHost($host);
|
||||||
$tasksToRun = $this->getConfig()->getTasks('post-release');
|
$tasksToRun = $this->getConfig()->getTasks('post-release');
|
||||||
$tasks = count($tasksToRun);
|
$tasks = count($tasksToRun);
|
||||||
$completedTasks = 0;
|
$completedTasks = 0;
|
||||||
|
|
||||||
foreach ($tasksToRun as $task) {
|
|
||||||
$task = Mage_Task_Factory::get($task, $this->getConfig(), false, 'post-release');
|
|
||||||
|
|
||||||
if ($this->_runTask($task)) {
|
Mage_Console::output('Starting <dark_gray>Post-Release</dark_gray> tasks for <dark_gray>' . $host . '</dark_gray>:');
|
||||||
$completedTasks++;
|
|
||||||
}
|
foreach ($tasksToRun as $task) {
|
||||||
|
$task = Mage_Task_Factory::get($task, $this->getConfig(), false, 'post-release');
|
||||||
|
|
||||||
|
if ($this->_runTask($task)) {
|
||||||
|
$completedTasks++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($completedTasks == $tasks) {
|
||||||
|
$tasksColor = 'green';
|
||||||
|
} else {
|
||||||
|
$tasksColor = 'red';
|
||||||
|
}
|
||||||
|
Mage_Console::output('Finished <dark_gray>Post-Release</dark_gray> tasks for <dark_gray>' . $host . '</dark_gray>: <' . $tasksColor . '>' . $completedTasks . '/' . $tasks . '</' . $tasksColor . '> tasks done.', 1, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($completedTasks == $tasks) {
|
|
||||||
$tasksColor = 'green';
|
|
||||||
} else {
|
|
||||||
$tasksColor = 'red';
|
|
||||||
}
|
|
||||||
Mage_Console::output('Finished <dark_gray>Post-Release</dark_gray> tasks for <dark_gray>' . $host . '</dark_gray>: <' . $tasksColor . '>' . $completedTasks . '/' . $tasks . '</' . $tasksColor . '> tasks done.', 1, 3);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -168,7 +171,7 @@ class Mage_Command_BuiltIn_Deploy
|
|||||||
foreach ($tasksToRun as $taskData) {
|
foreach ($tasksToRun as $taskData) {
|
||||||
$tasks++;
|
$tasks++;
|
||||||
$task = Mage_Task_Factory::get($taskData, $config, false, $stage);
|
$task = Mage_Task_Factory::get($taskData, $config, false, $stage);
|
||||||
|
|
||||||
if ($this->_runTask($task)) {
|
if ($this->_runTask($task)) {
|
||||||
$completedTasks++;
|
$completedTasks++;
|
||||||
}
|
}
|
||||||
@ -183,7 +186,7 @@ class Mage_Command_BuiltIn_Deploy
|
|||||||
Mage_Console::output('Finished <dark_gray>' . $title . '</dark_gray> tasks: <' . $tasksColor . '>' . $completedTasks . '/' . $tasks . '</' . $tasksColor . '> tasks done.', 1, 3);
|
Mage_Console::output('Finished <dark_gray>' . $title . '</dark_gray> tasks: <' . $tasksColor . '>' . $completedTasks . '/' . $tasks . '</' . $tasksColor . '> tasks done.', 1, 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function _runTask($task, $title = null)
|
private function _runTask($task, $title = null)
|
||||||
{
|
{
|
||||||
$task->init();
|
$task->init();
|
||||||
@ -192,17 +195,17 @@ class Mage_Command_BuiltIn_Deploy
|
|||||||
$title = 'Running <purple>' . $task->getName() . '</purple> ... ';
|
$title = 'Running <purple>' . $task->getName() . '</purple> ... ';
|
||||||
}
|
}
|
||||||
Mage_Console::output($title, 2, 0);
|
Mage_Console::output($title, 2, 0);
|
||||||
|
|
||||||
$runTask = true;
|
$runTask = true;
|
||||||
if (($task instanceOf Mage_Task_Releases_SkipOnOverride) && $this->getConfig()->getParameter('overrideRelease', false)) {
|
if (($task instanceOf Mage_Task_Releases_SkipOnOverride) && $this->getConfig()->getParameter('overrideRelease', false)) {
|
||||||
$runTask == false;
|
$runTask == false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = false;
|
$result = false;
|
||||||
if ($runTask == true) {
|
if ($runTask == true) {
|
||||||
try {
|
try {
|
||||||
$result = $task->run();
|
$result = $task->run();
|
||||||
|
|
||||||
if ($result == true) {
|
if ($result == true) {
|
||||||
Mage_Console::output('<green>OK</green>', 0);
|
Mage_Console::output('<green>OK</green>', 0);
|
||||||
$result = true;
|
$result = true;
|
||||||
@ -223,7 +226,7 @@ class Mage_Command_BuiltIn_Deploy
|
|||||||
Mage_Console::output('<yellow>SKIPPED</yellow>', 0);
|
Mage_Console::output('<yellow>SKIPPED</yellow>', 0);
|
||||||
$result = true;
|
$result = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
bin/mage
2
bin/mage
@ -1,5 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#VERSION:0.9.11
|
#VERSION:0.9.12
|
||||||
|
|
||||||
SCRIPT=$(readlink -f $0)
|
SCRIPT=$(readlink -f $0)
|
||||||
DIR=$(dirname $SCRIPT)
|
DIR=$(dirname $SCRIPT)
|
||||||
|
@ -3,7 +3,7 @@ date_default_timezone_set('UTC');
|
|||||||
|
|
||||||
$baseDir = dirname(dirname(__FILE__));
|
$baseDir = dirname(dirname(__FILE__));
|
||||||
|
|
||||||
define('MAGALLANES_VERSION', '0.9.11');
|
define('MAGALLANES_VERSION', '0.9.12');
|
||||||
|
|
||||||
// Preload
|
// Preload
|
||||||
require_once $baseDir . '/Mage/spyc.php';
|
require_once $baseDir . '/Mage/spyc.php';
|
||||||
|
Loading…
Reference in New Issue
Block a user