Merge branch 'master' into layout
This commit is contained in:
commit
b58b5e3e3e
|
@ -21,6 +21,7 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use PHPCI\Service\UserService;
|
||||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||
|
||||
/**
|
||||
* Install console command - Installs PHPCI.
|
||||
|
@ -253,6 +254,14 @@ class InstallCommand extends Command
|
|||
|
||||
$rtn = [];
|
||||
|
||||
$helper = $this->getHelper('question');
|
||||
$question = new ConfirmationQuestion('Use beanstalkd to manage build queue? ', true);
|
||||
|
||||
if (!$helper->ask($input, $output, $question)) {
|
||||
$output->writeln('<error>Skipping beanstalkd configuration.</error>');
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!$rtn['host'] = $input->getOption('queue-server')) {
|
||||
$rtn['host'] = $dialog->ask($output, 'Enter your beanstalkd hostname [localhost]: ', 'localhost');
|
||||
}
|
||||
|
|
|
@ -200,6 +200,10 @@ class BuildController extends \PHPCI\Controller
|
|||
|
||||
$build = $this->buildService->createDuplicateBuild($copy);
|
||||
|
||||
if ($this->buildService->queueError) {
|
||||
$_SESSION['global_error'] = Lang::get('add_to_queue_failed');
|
||||
}
|
||||
|
||||
$response = new b8\Http\Response\RedirectResponse();
|
||||
$response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId());
|
||||
return $response;
|
||||
|
|
|
@ -116,6 +116,10 @@ class ProjectController extends PHPCI\Controller
|
|||
$email = $_SESSION['phpci_user']->getEmail();
|
||||
$build = $this->buildService->createBuild($project, null, urldecode($branch), $email);
|
||||
|
||||
if ($this->buildService->queueError) {
|
||||
$_SESSION['global_error'] = Lang::get('add_to_queue_failed');
|
||||
}
|
||||
|
||||
$response = new b8\Http\Response\RedirectResponse();
|
||||
$response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId());
|
||||
return $response;
|
||||
|
|
|
@ -372,6 +372,9 @@ PHPCI',
|
|||
'project_id_argument' => 'A project ID',
|
||||
'commit_id_option' => 'Commit ID to build',
|
||||
'branch_name_option' => 'Branch to build',
|
||||
'add_to_queue_failed' => 'Build created successfully, but failed to add to build queue. This usually happens
|
||||
when PHPCI is set to use a beanstalkd server that does not exist,
|
||||
or your beanstalkd server has stopped.',
|
||||
|
||||
// Run Command
|
||||
'run_all_pending' => 'Run all pending PHPCI builds.',
|
||||
|
|
18
PHPCI/Migrations/20160623100223_project_table_defaults.php
Normal file
18
PHPCI/Migrations/20160623100223_project_table_defaults.php
Normal file
|
@ -0,0 +1,18 @@
|
|||
<?php
|
||||
|
||||
use Phinx\Migration\AbstractMigration;
|
||||
use Phinx\Db\Adapter\MysqlAdapter;
|
||||
|
||||
class ProjectTableDefaults extends AbstractMigration
|
||||
{
|
||||
public function change()
|
||||
{
|
||||
$this->table('project')
|
||||
->changeColumn('build_config', MysqlAdapter::PHINX_TYPE_TEXT, array('null' => true))
|
||||
->changeColumn('archived', MysqlAdapter::PHINX_TYPE_INTEGER, array(
|
||||
'length' => MysqlAdapter::INT_TINY,
|
||||
'default' => 0,
|
||||
))
|
||||
->save();
|
||||
}
|
||||
}
|
|
@ -96,7 +96,7 @@ class Project extends ProjectBase
|
|||
$info = $this->data['access_information'];
|
||||
|
||||
// Handle old-format (serialized) access information first:
|
||||
if (!empty($info) && substr($info, 0, 1) != '{') {
|
||||
if (!empty($info) && !in_array(substr($info, 0, 1), array('{', '['))) {
|
||||
$data = unserialize($info);
|
||||
} else {
|
||||
$data = json_decode($info, true);
|
||||
|
|
5
PHPCI/Plugin/PhpCpd.php
Normal file → Executable file
5
PHPCI/Plugin/PhpCpd.php
Normal file → Executable file
|
@ -50,17 +50,12 @@ class PhpCpd implements \PHPCI\Plugin
|
|||
$this->build = $build;
|
||||
|
||||
$this->path = $phpci->buildPath;
|
||||
$this->standard = 'PSR1';
|
||||
$this->ignore = $phpci->ignore;
|
||||
|
||||
if (!empty($options['path'])) {
|
||||
$this->path = $phpci->buildPath . $options['path'];
|
||||
}
|
||||
|
||||
if (!empty($options['standard'])) {
|
||||
$this->standard = $options['standard'];
|
||||
}
|
||||
|
||||
if (!empty($options['ignore'])) {
|
||||
$this->ignore = $options['ignore'];
|
||||
}
|
||||
|
|
|
@ -30,6 +30,11 @@ class BuildService
|
|||
*/
|
||||
protected $buildStore;
|
||||
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
public $queueError = false;
|
||||
|
||||
/**
|
||||
* @param BuildStore $buildStore
|
||||
*/
|
||||
|
@ -155,27 +160,30 @@ class BuildService
|
|||
}
|
||||
|
||||
$config = Config::getInstance();
|
||||
|
||||
$settings = $config->get('phpci.worker', []);
|
||||
|
||||
if (!empty($settings['host']) && !empty($settings['queue'])) {
|
||||
$jobData = array(
|
||||
'type' => 'phpci.build',
|
||||
'build_id' => $build->getId(),
|
||||
);
|
||||
try {
|
||||
$jobData = array(
|
||||
'type' => 'phpci.build',
|
||||
'build_id' => $build->getId(),
|
||||
);
|
||||
|
||||
if ($config->get('using_custom_file')) {
|
||||
$jobData['config'] = $config->getArray();
|
||||
if ($config->get('using_custom_file')) {
|
||||
$jobData['config'] = $config->getArray();
|
||||
}
|
||||
|
||||
$pheanstalk = new Pheanstalk($settings['host']);
|
||||
$pheanstalk->useTube($settings['queue']);
|
||||
$pheanstalk->put(
|
||||
json_encode($jobData),
|
||||
PheanstalkInterface::DEFAULT_PRIORITY,
|
||||
PheanstalkInterface::DEFAULT_DELAY,
|
||||
$config->get('phpci.worker.job_timeout', 600)
|
||||
);
|
||||
} catch (\Exception $ex) {
|
||||
$this->queueError = true;
|
||||
}
|
||||
|
||||
$pheanstalk = new Pheanstalk($settings['host']);
|
||||
$pheanstalk->useTube($settings['queue']);
|
||||
$pheanstalk->put(
|
||||
json_encode($jobData),
|
||||
PheanstalkInterface::DEFAULT_PRIORITY,
|
||||
PheanstalkInterface::DEFAULT_DELAY,
|
||||
$config->get('phpci.worker.job_timeout', 600)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -292,6 +292,14 @@
|
|||
|
||||
<!-- Main content -->
|
||||
<section class="content">
|
||||
<?php
|
||||
if (!empty($_SESSION['global_error'])) {
|
||||
$message = $_SESSION['global_error'];
|
||||
unset($_SESSION['global_error']);
|
||||
print '<div class="alert alert-danger">' . $message . '</div>';
|
||||
}
|
||||
?>
|
||||
|
||||
<?php print $content; ?>
|
||||
</section><!-- /.content -->
|
||||
</aside><!-- /.content-wrapper -->
|
||||
|
|
|
@ -11,6 +11,12 @@ PHPCI is a free and open source (BSD License) continuous integration tool specif
|
|||
|
||||
We have a chat room for discussing PHPCI, you can access it here: [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/Block8/PHPCI?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge)
|
||||
|
||||
**Support the development of PHPCI**
|
||||
|
||||
We [now accept donations](https://www.phptesting.org/support) to directly support the ongoing development of PHPCI. There is of course no obligation to donate, nor any commitment if you do.
|
||||
|
||||
[Donate](https://www.phptesting.org/support)
|
||||
|
||||
## What it does:
|
||||
* Clones your project from Github, Bitbucket or a local path
|
||||
* Allows you to set up and tear down test databases.
|
||||
|
|
Loading…
Reference in a new issue