Skip to content

Commit

Permalink
Merge 3cf7ec3 into 472ce76
Browse files Browse the repository at this point in the history
  • Loading branch information
eiriksm committed Jul 26, 2020
2 parents 472ce76 + 3cf7ec3 commit 21bd54c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ php:
install:
- composer install --no-interaction
script:
- if [[ $(phpenv version-name) != "7.0" ]]; then composer require --dev phpstan/phpstan bitbucket/client cweagans/composer-patches; fi
- if [[ $(phpenv version-name) != "7.0" ]]; then composer require --dev phpstan/phpstan bitbucket/client:^2 cweagans/composer-patches; fi
- if [[ $(phpenv version-name) != "7.0" ]]; then rm -rf vendor/phpunit; fi
- if [[ $(phpenv version-name) != "7.0" ]]; then composer install; fi
- composer test
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"league/flysystem": "^1.0",
"eiriksm/symfony-console-array-output": "^1.0",
"violinist-dev/project-data": "^1.1.1",
"m4tthumphrey/php-gitlab-api": "^9.10",
"m4tthumphrey/php-gitlab-api": "~9.17.0",
"peterpostmann/parse_uri": "^1.0",
"violinist-dev/composer-updater": "dev-master",
"violinist-dev/process-factory": "^1.0",
Expand Down
5 changes: 5 additions & 0 deletions src/CosyComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -874,12 +874,17 @@ protected function commitFiles($package_name)
$package_name
);
if ($this->execCommand($command, false)) {
$this->log($this->getLastStdOut(), Message::COMMAND);
$this->log($this->getLastStdErr(), Message::COMMAND);
throw new \Exception('Error committing the composer files. They are probably not changed.');
}
}

protected function runAuthExportToken($hostname, $token)
{
if (empty($token)) {
return;
}
switch ($hostname) {
case 'github.com':
$this->execCommand(
Expand Down

0 comments on commit 21bd54c

Please sign in to comment.