Merge branch 'develop'

gboddin · May 3, 2018 · 871f2b1 · 871f2b1
2 parents 2eae224 + 27336b3
commit 871f2b1
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 115 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -4,31 +4,19 @@ pipeline:
     lock_file: composer.lock
 
   install:
-    image: fpfis/php71-dev
+    image: phpdrone/composer:php56-latest
     commands:
       - composer install --ansi
 
   phpcs:
-    image: fpfis/php71-dev
+    image: phpdrone/composer:php56-latest
     commands:
       - ./vendor/bin/phpcs
 
-  build-dev:
-    image: fpfis/php71-dev
-    commands: 
-      - ./vendor/bin/phar-composer --ansi build . ghcli-dev.phar
-    when:
-      event: push
-
-  build-release:
-    image: fpfis/php71-dev
-    commands:
-      - wget https://github.com/clue/phar-composer/releases/download/v1.0.0/phar-composer.phar -O /tmp/phar-composer
-      - composer install --ansi --no-dev 
-      - php /tmp/phar-composer --ansi build . ghcli.phar
-    when:
-      event: tag
-
+  build-phar:
+    image: phpdrone/phar-composer
+    output: ghcli.phar
+
   github_release:
     image: plugins/github-release
     secrets: [ github_token ]

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Github PHP CLI client",
     "type": "project",
     "require": {
-        "symfony/console": "~2.7",
+        "symfony/console": "~2|~3",
         "knplabs/github-api": "^2.5",
         "php-http/guzzle6-adapter": "^1.1"
     },