From fded3b027307e5788cb8a4c0f586eb3f2c09e2a4 Mon Sep 17 00:00:00 2001 From: Tom Reznick Date: Tue, 5 Feb 2019 17:05:58 -0500 Subject: [PATCH 1/4] Build on both Trusty and Xenial --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81e7c696..05d12ecd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,14 +33,18 @@ env: - PGVERSION=9.6 - PGVERSION=9.4 - +matrix: + include: + - os: linux + dist: trusty + - os: linux + dist: xenial language: cpp compiler: - gcc sudo: required -dist: trusty script: - make && sudo make install && make installcheck From 8616f3fd282b7b509c240f9e0cfc617d2323b722 Mon Sep 17 00:00:00 2001 From: Tom Reznick Date: Tue, 5 Feb 2019 17:13:49 -0500 Subject: [PATCH 2/4] Use named builds --- .travis.yml | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05d12ecd..ae79ad70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,20 +25,40 @@ before_script: - gcc -v - createuser -U postgres -s travis - -env: - matrix: - - PGVERSION=11 - - PGVERSION=10 - - PGVERSION=9.6 - - PGVERSION=9.4 - matrix: include: - - os: linux + - name: "PG 9.4 trusty" + os: linux + dist: trusty + env: PGVERSION=9.4 + - name: "PG 9.6 trusty" + os: linux + dist: trusty + env: PGVERSION=9.6 + - name: "PG 10 trusty" + os: linux dist: trusty - - os: linux + env: PGVERSION=10 + - name: "PG 11 trusty" + os: linux + dist: trusty + env: PGVERSION=11 + - name: "PG 9.4 xenial" + os: linux + dist: xenial + env: PGVERSION=9.4 + - name: "PG 9.6 xenial" + os: linux + dist: xenial + env: PGVERSION=9.6 + - name: "PG 10 xenial" + os: linux + dist: xenial + env: PGVERSION=10 + - name: "PG 11 xenial" + os: linux dist: xenial + env: PGVERSION=11 language: cpp compiler: From a3f8114ec084848eefde3df25af47ee7261cb0dd Mon Sep 17 00:00:00 2001 From: Tom Reznick Date: Wed, 6 Feb 2019 14:39:47 -0500 Subject: [PATCH 3/4] don't always assume trusty --- .travis.yml | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae79ad70..d34cc0db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ before_install: - sudo apt-get -y --purge remove postgresql libpq-dev libpq5 postgresql-client-common postgresql-common - sudo rm -rf /var/lib/postgresql - wget --no-check-certificate --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - - - sudo sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main $PGVERSION >> /etc/apt/sources.list.d/postgresql.list" + - sudo sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ $DISTRO-pgdg main $PGVERSION >> /etc/apt/sources.list.d/postgresql.list" - sudo apt-get update -qq - sudo apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::="--force-confnew" install postgresql-$PGVERSION postgresql-server-dev-$PGVERSION - sudo chmod 777 /etc/postgresql/$PGVERSION/main/pg_hba.conf @@ -30,35 +30,51 @@ matrix: - name: "PG 9.4 trusty" os: linux dist: trusty - env: PGVERSION=9.4 + env: + - DISTRO=trusty + - PGVERSION=9.4 - name: "PG 9.6 trusty" os: linux dist: trusty - env: PGVERSION=9.6 + env: + - DISTRO=trusty + - PGVERSION=9.6 - name: "PG 10 trusty" os: linux dist: trusty - env: PGVERSION=10 + env: + - DISTRO=trusty + - PGVERSION=10 - name: "PG 11 trusty" os: linux dist: trusty - env: PGVERSION=11 + env: + - DISTRO=trusty + - PGVERSION=11 - name: "PG 9.4 xenial" os: linux dist: xenial - env: PGVERSION=9.4 + env: + - DISTRO=xenial + - PGVERSION=9.4 - name: "PG 9.6 xenial" os: linux dist: xenial - env: PGVERSION=9.6 + env: + - DISTRO=xenial + - PGVERSION=9.6 - name: "PG 10 xenial" os: linux dist: xenial - env: PGVERSION=10 + env: + - DISTRO=xenial + - PGVERSION=10 - name: "PG 11 xenial" os: linux dist: xenial - env: PGVERSION=11 + env: + - DISTRO=xenial + - PGVERSION=11 language: cpp compiler: From e17ef1825093948739d0698d1f4f1df9082f855b Mon Sep 17 00:00:00 2001 From: Tom Reznick Date: Wed, 6 Feb 2019 16:29:19 -0500 Subject: [PATCH 4/4] Pin gcc to 4.8.5 on xenial for travis --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index d34cc0db..2a85af38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,24 +57,40 @@ matrix: env: - DISTRO=xenial - PGVERSION=9.4 + addons: + apt: + packages: + - gcc-4.8.5 - name: "PG 9.6 xenial" os: linux dist: xenial env: - DISTRO=xenial - PGVERSION=9.6 + addons: + apt: + packages: + - gcc-4.8.5 - name: "PG 10 xenial" os: linux dist: xenial env: - DISTRO=xenial - PGVERSION=10 + addons: + apt: + packages: + - gcc-4.8.5 - name: "PG 11 xenial" os: linux dist: xenial env: - DISTRO=xenial - PGVERSION=11 + addons: + apt: + packages: + - gcc-4.8.5 language: cpp compiler: