From 6bfdec78afd073a1370e06357657c73c965aa856 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Thu, 30 Apr 2020 03:21:47 +0900
Subject: [PATCH 1/2] Fix workspace compilation

---
 Cargo.toml                    | 3 +--
 simple-auth-server/Cargo.toml | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index dbd700d6..b01e3a4a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,8 +34,7 @@ members = [
    "rustls",
    "shutdown-server",
    "server-sent-events",
-# Depency clang outdate bindgen@0.48
-#   "simple-auth-server",
+   "simple-auth-server",
    "state",
    "static_index",
    "template_askama",
diff --git a/simple-auth-server/Cargo.toml b/simple-auth-server/Cargo.toml
index 5cc38aa2..240ae958 100644
--- a/simple-auth-server/Cargo.toml
+++ b/simple-auth-server/Cargo.toml
@@ -9,7 +9,8 @@ workspace = ".."
 actix-identity = "0.2.0"
 actix-web = "2.0.0"
 actix-rt = "1.0.0"
-argonautica = "0.2.0"
+# FIXME: Specify the commit hash to use bindgen v0.50.
+argonautica = { git = "https://github.com/bcmyers/argonautica", rev = "67fc8d8d7d67696cd8ca7a59b92531f06b089212" }
 chrono = { version = "0.4.6", features = ["serde"] }
 derive_more = "0.99.0"
 diesel = { version = "1.4.2", features = ["postgres", "uuidv07", "r2d2", "chrono"] }

From f624a3b0118627e99d173256332f2832ee662f25 Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Thu, 30 Apr 2020 05:34:22 +0900
Subject: [PATCH 2/2] Tweak CI config

---
 .travis.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 68bc4417..e0c3e311 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,12 @@
 language: rust
-sudo: false
-dist: trusty
+dist: xenial
+
+addons:
+  apt:
+    sources:
+      - ppa:chris-lea/redis-server
+    packages:
+      - redis-server
 
 services:
   - redis-server
@@ -25,12 +31,11 @@ matrix:
 env:
   global:
     # - RUSTFLAGS="-C link-dead-code"
-    - OPENSSL_VERSION=openssl-1.0.2
+    - OPENSSL_VERSION=openssl-1.1.1
 
 before_install:
-  - sudo add-apt-repository -y ppa:0k53d-karl-f830m/openssl
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq libssl-dev libelf-dev libdw-dev cmake gcc binutils-dev libiberty-dev
+  - sudo apt-get -qq update
+  - sudo apt-get -y install libssl-dev libelf-dev libdw-dev binutils-dev libiberty-dev
 
 # Add clippy
 before_script: