From 342e29bbbf53b02359dfa21a63bd8b3b6e104b20 Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Mon, 11 Jun 2018 12:01:14 +0000
Subject: CI against PostgreSQL 10

- Replace port number 5433 to 5432 (default value) which Active Record unit tests expect
- Restart PostgreSQL 10 service after changing port number
- PostgreSQL 10 is a addon for the current Travis CI. Installing
PostgreSQL 10 would cause longer CI to getting additional apt packages
Refer https://docs.travis-ci.com/user/database-setup/#PostgreSQL

- Use `sudo: required` for railties CI expecting PostgreSQL is up and running
---
 .travis.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 6943a67ffe..109005b407 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ services:
   - redis-server
 
 addons:
-  postgresql: "9.6"
+  postgresql: 10
   chrome: stable
   apt:
     sources:
@@ -28,6 +28,8 @@ addons:
       - poppler-utils
       - mysql-server
       - mysql-client
+      - postgresql-10
+      - postgresql-client-10
 
 bundler_args: --without test --jobs 3 --retry 3
 before_install:
@@ -53,12 +55,10 @@ env:
   global:
     - "JRUBY_OPTS='--dev -J-Xmx1024M'"
   matrix:
-    - "GEM=railties"
     - "GEM=ap,ac"
     - "GEM=am,amo,as,av,aj,ast"
     - "GEM=as PRESERVE_TIMEZONES=1"
     - "GEM=ar:sqlite3"
-    - "GEM=ar:postgresql"
     - "GEM=guides"
     - "GEM=ac:integration"
 
@@ -69,6 +69,33 @@ rvm:
 
 matrix:
   include:
+    - rvm: 2.4.4
+      env: "GEM=railties"
+      sudo: required
+      before_install:
+        - "rm ${BUNDLE_GEMFILE}.lock"
+        - "travis_retry gem update --system"
+        - "travis_retry gem install bundler"
+        - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf"
+        - "sudo service postgresql restart 10"
+    - rvm: 2.5.1
+      env: "GEM=railties"
+      sudo: required
+      before_install:
+        - "rm ${BUNDLE_GEMFILE}.lock"
+        - "travis_retry gem update --system"
+        - "travis_retry gem install bundler"
+        - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf"
+        - "sudo service postgresql restart 10"
+    - rvm: ruby-head
+      env: "GEM=railties"
+      sudo: required
+      before_install:
+        - "rm ${BUNDLE_GEMFILE}.lock"
+        - "travis_retry gem update --system"
+        - "travis_retry gem install bundler"
+        - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf"
+        - "sudo service postgresql restart 10"
     - rvm: 2.5.1
       env: "GEM=av:ujs"
     - rvm: 2.4.4
@@ -118,6 +145,24 @@ matrix:
     - rvm: 2.5.1
       env:
         - "GEM=ar:sqlite3_mem"
+    - rvm: 2.4.4
+      env: "GEM=ar:postgresql"
+      sudo: required
+      before_install:
+        - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf"
+        - "sudo service postgresql restart 10"
+    - rvm: 2.5.1
+      env: "GEM=ar:postgresql"
+      sudo: required
+      before_install:
+        - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf"
+        - "sudo service postgresql restart 10"
+    - rvm: ruby-head
+      env: "GEM=ar:postgresql"
+      sudo: required
+      before_install:
+        - "sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/10/main/postgresql.conf"
+        - "sudo service postgresql restart 10"
     - rvm: 2.5.1
       env:
         - "GEM=ar:postgresql POSTGRES=9.2"
-- 
cgit v1.2.3