Skip to content

Commit

Permalink
Added ext-curl to the composer requirements, updated the README, fixe…
Browse files Browse the repository at this point in the history
…d a path bug in run.php
  • Loading branch information
eXistenZNL committed Mar 18, 2016
1 parent c0cfcad commit a11e71a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,23 @@ Copy the `dev/config.dist.php` to `dev/config.php`, and edit the file to configu
return [
'username' => 'myMergeBot', // Your github username
'password' => 'somepass123', // Your github password
// The title that will be used for your PR's, %s being the branch names:
// The title that will be used for your PRs, the first %s being the
// branch to merge from, the second %s being the to branch to merge to.
'prTitle' => 'Make sure that %s is in %s!',
// Message the PRBot uses for the pull request:
'prBody' => '![](https://heavyeditorial.files.wordpress.com/2012/08/thumbsup.gif)',
'github' => [
// http://github.com/UserOrOrganisation/ProjectA
'UserOrOrganisation' => [
// http://github.com/SomeUserOrOrganisation/ProjectA
'SomeUserOrOrganisation' => [
'ProjectA' => [
// Merges back release/1.1 into release/1.2
'release/1.1' => 'release/1.2',
// Merges back release/1.2 into develop
'release/1.2' => 'develop',
],
],
// http://github.com/UserOrOrganisation/ProjectB
'UserOrOrganisation' => [
// http://github.com/AnotherUserOrOrganisation/ProjectB
'AnotherUserOrOrganisation' => [
'ProjectB' => [
// Merges back release/2.0 into develop
'release/2.0' => 'develop',
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"name": "enrise/prbot",
"description": "Automated pull requests for forgotten merge-backs",
"require": {
"tan-tan-kanarek/github-php-client": "^1.0"
"tan-tan-kanarek/github-php-client": "^1.0",
"ext-curl": "*"
},
"authors": [
{
Expand Down
8 changes: 5 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/run.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require __DIR__ . '../vendor/autoload.php';
$config = require __DIR__ . '../dev/config.php';
require __DIR__ . '/../vendor/autoload.php';
$config = require __DIR__ . '/../dev/config.php';

$client = new GitHubClient();

Expand Down

0 comments on commit a11e71a

Please sign in to comment.