danog/ext-pq
1
0
Fork 0
mirror of https://github.com/danog/ext-pq.git synced 2024-11-26 20:04:44 +01:00
Code Issues Projects Releases Wiki Activity

update travis-pecl

Browse Source
This commit is contained in:
Michael Wallner 2018-03-02 17:01:54 +01:00
parent 11075db860
commit b79edc51df
No known key found for this signature in database
GPG Key ID: 480E3E14B0A4C7C7
7 changed files with 87 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
.travis.yml
View File

@ -1,5 +1,6 @@
# autogenerated file; do not edit # autogenerated file; do not edit
language: c language: c
sudo: false
addons: addons:
postgresql: 9.4 postgresql: 9.4
@ -9,50 +10,34 @@ addons:
- php-pear - php-pear
- valgrind - valgrind
compiler:
- gcc
- clang
env: env:
global: global:
- PQ_DSN="postgres://postgres@localhost/test" - PQ_DSN="postgres://postgres@localhost/test"
matrix: matrix:
- PHP=7.0 enable_debug=no enable_maintainer_zts=no enable_json=no
- PHP=7.1 enable_debug=no enable_maintainer_zts=no enable_json=no
- PHP=7.2 enable_debug=no enable_maintainer_zts=no enable_json=no
- PHP=master enable_debug=no enable_maintainer_zts=no enable_json=no
- PHP=7.0 enable_debug=yes enable_maintainer_zts=no enable_json=no
- PHP=7.1 enable_debug=yes enable_maintainer_zts=no enable_json=no
- PHP=7.2 enable_debug=yes enable_maintainer_zts=no enable_json=no
- PHP=master enable_debug=yes enable_maintainer_zts=no enable_json=no
- PHP=7.0 enable_debug=no enable_maintainer_zts=yes enable_json=no
- PHP=7.1 enable_debug=no enable_maintainer_zts=yes enable_json=no
- PHP=7.2 enable_debug=no enable_maintainer_zts=yes enable_json=no
- PHP=master enable_debug=no enable_maintainer_zts=yes enable_json=no
- PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=no
- PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=no
- PHP=7.2 enable_debug=yes enable_maintainer_zts=yes enable_json=no
- PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=no
- PHP=7.0 enable_debug=no enable_maintainer_zts=no enable_json=yes
- PHP=7.1 enable_debug=no enable_maintainer_zts=no enable_json=yes
- PHP=7.2 enable_debug=no enable_maintainer_zts=no enable_json=yes
- PHP=master enable_debug=no enable_maintainer_zts=no enable_json=yes
- PHP=7.0 enable_debug=yes enable_maintainer_zts=no enable_json=yes
- PHP=7.1 enable_debug=yes enable_maintainer_zts=no enable_json=yes
- PHP=7.2 enable_debug=yes enable_maintainer_zts=no enable_json=yes
- PHP=master enable_debug=yes enable_maintainer_zts=no enable_json=yes
- PHP=7.0 enable_debug=no enable_maintainer_zts=yes enable_json=yes
- PHP=7.1 enable_debug=no enable_maintainer_zts=yes enable_json=yes
- PHP=7.2 enable_debug=no enable_maintainer_zts=yes enable_json=yes
- PHP=master enable_debug=no enable_maintainer_zts=yes enable_json=yes
- PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
- PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
- PHP=7.2 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
- PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
- PHP=7.2 enable_json=no
- PHP=7.2 enable_json=yes enable_debug=no enable_maintainer_zts=no
- PHP=7.2 enable_json=yes enable_debug=yes enable_maintainer_zts=no
- PHP=7.2 enable_json=yes enable_debug=no enable_maintainer_zts=yes
- PHP=7.2 enable_json=yes enable_debug=yes enable_maintainer_zts=yes
- PHP=7.2 enable_json=yes CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'
before_script: install:
- make -f travis/pecl/Makefile php - make -f travis/pecl/Makefile php
- make -f travis/pecl/Makefile pecl PECL=raphf:raphf:2.0.0 - make -f travis/pecl/Makefile pecl PECL=raphf:raphf:2.0.0
- make -f travis/pecl/Makefile ext PECL=pq
before_script:
- psql -U postgres -c "CREATE DATABASE test" - psql -U postgres -c "CREATE DATABASE test"
script: script:
- make -f travis/pecl/Makefile ext PECL=pq
- make -f travis/pecl/Makefile test - make -f travis/pecl/Makefile test
sudo: false after_success:
- test -n "$CFLAGS" && cd src/.libs && bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy

41
gen_travis_yml.php
View File

@ -1,41 +0,0 @@
#!/usr/bin/env php
# autogenerated file; do not edit
language: c
addons:
postgresql: 9.4
apt:
packages:
- php5-cli
- php-pear
- valgrind
env:
global:
- PQ_DSN="postgres://postgres@localhost/test"
matrix:
<?php
$gen = include "./travis/pecl/gen-matrix.php";
$env = $gen([
"PHP" => ["7.0", "7.1", "7.2", "master"],
"enable_debug",
"enable_maintainer_zts",
"enable_json",
]);
foreach ($env as $e) {
printf(" - %s\n", $e);
}
?>
before_script:
- make -f travis/pecl/Makefile php
- make -f travis/pecl/Makefile pecl PECL=raphf:raphf:2.0.0
- make -f travis/pecl/Makefile ext PECL=pq
- psql -U postgres -c "CREATE DATABASE test"
script:
- make -f travis/pecl/Makefile test
sudo: false

2
gen_pq_type.sh → scripts/gen_pq_type.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
CWD=$(dirname $0) CWD=$(dirname $0)
awk -f $CWD/php_pq_type.awk >$CWD/php_pq_type.h \ awk -f $CWD/php_pq_type.awk >$CWD/../php_pq_type.h \
<${1-/usr/include/postgresql}/server/catalog/pg_type.h <${1-/usr/include/postgresql}/server/catalog/pg_type.h

66
scripts/gen_travis_yml.php Executable file
View File

@ -0,0 +1,66 @@
#!/usr/bin/env php
# autogenerated file; do not edit
language: c
sudo: false
addons:
postgresql: 9.4
apt:
packages:
- php5-cli
- php-pear
- valgrind
compiler:
- gcc
- clang
env:
global:
- PQ_DSN="postgres://postgres@localhost/test"
matrix:
<?php
$gen = include "./travis/pecl/gen-matrix.php";
$cur = "7.2";
$env = $gen([
"PHP" => ["7.0", "7.1", "master"],
"enable_debug" => "yes",
"enable_maintainer_zts" => "yes",
"enable_json" => "yes",
], [
"PHP" => $cur,
"enable_json" => "no",
], [
"PHP" => $cur,
"enable_json" => "yes",
"enable_debug",
"enable_maintainer_zts"
], [
"PHP" => $cur,
"enable_json" => "yes",
"CFLAGS" => "'-O0 -g --coverage'",
"CXXFLAGS" => "'-O0 -g --coverage'",
]);
foreach ($env as $g) {
foreach ($g as $e) {
printf(" - %s\n", $e);
}
}
?>
install:
- make -f travis/pecl/Makefile php
- make -f travis/pecl/Makefile pecl PECL=raphf:raphf:2.0.0
before_script:
- psql -U postgres -c "CREATE DATABASE test"
script:
- make -f travis/pecl/Makefile ext PECL=pq
- make -f travis/pecl/Makefile test
after_success:
- test -n "$CFLAGS" && cd src/.libs && bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy

0
php_pq_type.awk → scripts/php_pq_type.awk
View File

2
src/php_pq_params.c
View File

@ -75,7 +75,9 @@ unsigned php_pq_params_add_type_oid(php_pq_params_t *p, Oid type)
static zend_string *object_param_to_string(php_pq_params_t *p, zval *zobj, Oid type) static zend_string *object_param_to_string(php_pq_params_t *p, zval *zobj, Oid type)
{ {
#if PHP_PQ_HAVE_PHP_JSON_H && defined(PHP_PQ_OID_JSON)
smart_str str = {0}; smart_str str = {0};
#endif
switch (type) { switch (type) {
#if PHP_PQ_HAVE_PHP_JSON_H && defined(PHP_PQ_OID_JSON) #if PHP_PQ_HAVE_PHP_JSON_H && defined(PHP_PQ_OID_JSON)

2
travis/pecl

@ -1 +1 @@
Subproject commit 05f5e23f9c6a3d588675f0387c882af1f57c0e4e Subproject commit 2622a78d9eb346103f502445f6ac8d315ebfecc5