From: Michael Wallner <mike@php.net>
Date: Thu, 30 Jul 2015 15:44:00 +0000 (+0200)
Subject: try that again
X-Git-Tag: v0.6.0~16
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ee1c068bfa56b56d82e61d9e5fde017d3003817f;p=m6w6%2Fext-pq

try that again
---

diff --git a/.travis.yml b/.travis.yml
index 0f5f740..af263d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ language: c
 
 addons:
  postgresql: 9.4
+ apt:
+  packages:
+   - php5-cli
 
 env:
  global:
diff --git a/gen_travis_yml.php b/gen_travis_yml.php
index 8473159..0e06a81 100755
--- a/gen_travis_yml.php
+++ b/gen_travis_yml.php
@@ -4,6 +4,9 @@ language: c
 
 addons:
  postgresql: 9.4
+ apt:
+  packages:
+   - php5-cli
 
 env:
  global:
diff --git a/travis/pecl/Makefile b/travis/pecl/Makefile
index a338a5d..26d6b39 100644
--- a/travis/pecl/Makefile
+++ b/travis/pecl/Makefile
@@ -23,7 +23,7 @@ PECL_SONAME ?= $(if $(shell cut -d: -f2 <<<"$(PECL)"),$(shell cut -d: -f2 <<<"$(
 PECL_VERSION ?= $(shell cut -d: -f3 -s <<<"$(PECL)")
 PECL_INI = $(with_config_file_scan_dir)/pecl.ini
 
-PHP_VERSION ?= $(shell php $(srcdir)/php-version.php $(PHP) < php-versions.json)
+PHP_VERSION ?= $(shell php $(srcdir)/php-version.php $(PHP) < $(srcdir)/php-versions.json 2>/dev/null)
 
 .PHONY: all php check clean reconf pecl ext test
 .SUFFIXES: