external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add PG11/master build, bump tools (#1588) 

This build is allowed to fail and finish-fast is enabled, so there is
no negative impact on developers, yet we can now stay better abreast of
upcoming PostgreSQL changes.

The latest citus tools version also adds enable-depend to the flags in
our "custom PG" source-based builds which will result in fewer false
failures due to build caching behavior.
pull/1635/merge
Jason Petersen 2017-08-30 18:17:28 -06:00 committed by GitHub
parent 56f98c7300
commit 0e134a9178
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -14,10 +14,15 @@ env:
# During pull request builds (not push builds), use custom-built PostgreSQL # During pull request builds (not push builds), use custom-built PostgreSQL
- USE_CUSTOM_PG="${TRAVIS_PULL_REQUEST_SHA}" - USE_CUSTOM_PG="${TRAVIS_PULL_REQUEST_SHA}"
matrix: matrix:
- PGVERSION=9.6 fast_finish: true
- PGVERSION=10 include:
- env: PGVERSION=9.6
- env: PGVERSION=10
- env: PGVERSION=11
allow_failures:
- env: PGVERSION=11
before_install: before_install:
- git clone -b v0.6.4 --depth 1 https://github.com/citusdata/tools.git - git clone -b v0.7.1 --depth 1 https://github.com/citusdata/tools.git
- sudo make -C tools install - sudo make -C tools install
- setup_apt - setup_apt
- curl https://install.citusdata.com/community/deb.sh | sudo bash - curl https://install.citusdata.com/community/deb.sh | sudo bash
@ -27,7 +32,12 @@ install:
- install_pg - install_pg
- install_custom_pg - install_custom_pg
# download and install HLL manually, as custom builds won't satisfy deps # download and install HLL manually, as custom builds won't satisfy deps
- apt-get download "postgresql-${PGVERSION}-hll=2.10.2.citus-1" && sudo dpkg --force-confold --force-confdef --force-all -i *hll*.deb # only install if performing non-11 build
- |
if [ "${PGVERSION}" != "11" ]; then
apt-get download "postgresql-${PGVERSION}-hll=2.10.2.citus-1"
sudo dpkg --force-confold --force-confdef --force-all -i *hll*.deb
fi
before_script: citus_indent --quiet --check before_script: citus_indent --quiet --check
script: CFLAGS=-Werror pg_travis_multi_test check script: CFLAGS=-Werror pg_travis_multi_test check
after_success: after_success:

2
configure vendored
View File

@ -2017,7 +2017,7 @@ if test -z "$version_num"; then
as_fn_error $? "Could not detect PostgreSQL version from pg_config." "$LINENO" 5 as_fn_error $? "Could not detect PostgreSQL version from pg_config." "$LINENO" 5
fi fi
if test "$version_num" != '9.6' -a "$version_num" != '10'; then if test "$version_num" != '9.6' -a "$version_num" != '10' -a "$version_num" != '11'; then
as_fn_error $? "Citus is not compatible with the detected PostgreSQL version ${version_num}." "$LINENO" 5 as_fn_error $? "Citus is not compatible with the detected PostgreSQL version ${version_num}." "$LINENO" 5
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: building against PostgreSQL $version_num" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: building against PostgreSQL $version_num" >&5

2
configure.in
View File

@ -59,7 +59,7 @@ if test -z "$version_num"; then
AC_MSG_ERROR([Could not detect PostgreSQL version from pg_config.]) AC_MSG_ERROR([Could not detect PostgreSQL version from pg_config.])
fi fi
if test "$version_num" != '9.6' -a "$version_num" != '10'; then if test "$version_num" != '9.6' -a "$version_num" != '10' -a "$version_num" != '11'; then
AC_MSG_ERROR([Citus is not compatible with the detected PostgreSQL version ${version_num}.]) AC_MSG_ERROR([Citus is not compatible with the detected PostgreSQL version ${version_num}.])
else else
AC_MSG_NOTICE([building against PostgreSQL $version_num]) AC_MSG_NOTICE([building against PostgreSQL $version_num])