From 751d122750784663bc49add9a4fbbaede31b7ad5 Mon Sep 17 00:00:00 2001
From: Justin Geibel <jtgeibel@gmail.com>
Date: Sun, 13 Oct 2019 21:24:06 -0400
Subject: [PATCH 1/2] Bump CI stack from xenial to bionic

---
 .github/workflows/ci.yml |  4 ++--
 .travis.yml              | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a8eb0bb90c..197599c3360 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   frontend:
     name: Frontend
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     env:
       JOBS: 1 # See https://git.io/vdao3 for details.
 
@@ -175,7 +175,7 @@ jobs:
 
       - name: Setup database
         run: |
-          which diesel || cargo install diesel_cli --vers $(cat .diesel_version) --no-default-features --features postgres
+          which diesel || cargo install diesel_cli --vers $(cat .diesel_version) --no-default-features --features postgres --debug
           diesel database setup --locked-schema
 
       - name: Lint
diff --git a/.travis.yml b/.travis.yml
index d05a9db592a..030f9b25d80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: rust
-sudo: required
-dist: xenial
+dist: bionic
 
 branches:
   only:
@@ -18,23 +17,20 @@ env:
   global:
     - RUST_BACKTRACE=1
     - JOBS=1 # See https://git.io/vdao3 for details.
-    - DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
-    - TEST_DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
+    - DATABASE_URL=postgres:///cargo_registry_test
+    - TEST_DATABASE_URL=postgres:///cargo_registry_test
     - CARGO_INCREMENTAL=0
     # Percy secrets are included here to enable Percy's GitHub integration
     # on community-submitted PRs
     - PERCY_TOKEN=0d8707a02b19aebbec79bb0bf302b8d2fa95edb33169cfe41b084289596670b1
     - PERCY_PROJECT=crates-io/crates.io
-    - PGPORT=5433
     - PATH=$HOME/.cargo/bin:$PATH
     - RUSTFLAGS="-C debuginfo=0 -D warnings"
     - MALLOC_CONF=background_thread:true,abort_conf:true,abort:true,junk:true
 
 install:
-  - sudo cp /etc/postgresql/10/main/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf
-  - sudo systemctl restart postgresql@11-main
   - script/ci/cargo-clean-on-new-rustc-version.sh
-  - which diesel || cargo install diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres
+  - which diesel || cargo install diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres --debug
 
 before_script:
   - diesel database setup --locked-schema

From 3b46fa54caab5ffcca621085c8138ee63896d674 Mon Sep 17 00:00:00 2001
From: Justin Geibel <jtgeibel@gmail.com>
Date: Sun, 20 Sep 2020 13:03:36 -0400
Subject: [PATCH 2/2] Move addons to specific jobs

The node_js containers hang for 5 minute when starting postgres 11,
which is not needed for those tests. The rust containers fail to
install chrome (because its deps are not installed by default there)
and it is not needed for those tests.

This also cleans up two validation warnings.
---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 030f9b25d80..d943cfcd54a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: rust
 dist: bionic
+os: linux
 
 branches:
   only:
@@ -36,14 +37,13 @@ before_script:
   - diesel database setup --locked-schema
 
 addons:
-  chrome: stable
   postgresql: "11"
   apt:
     packages:
       - postgresql-11
       - postgresql-client-11
 
-matrix:
+jobs:
   fast_finish: true
   allow_failures:
     - rust: nightly
@@ -60,6 +60,8 @@ matrix:
     - name: Frontend
       language: node_js
       node_js: 12
+      addons:
+        chrome: stable
       install:
         - npm ci
       before_script: skip