Merge pull request #310 from JohnTitor/fix-cmpl

Fix workspace compilation

.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:

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",

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"] }