sync with tci master

Author: gbarc80

lib/travis/build/addons/rethinkdb.rb

@@ -15,8 +15,8 @@ def after_prepare
             sh.else do
               sh.echo "Installing RethinkDB version #{rethinkdb_version}", ansi: :yellow
               sh.cmd "service rethinkdb stop", sudo: true
-              sh.cmd "sudo apt-key adv --keyserver keys.gnupg.net --recv-keys \"539A 3A8C 6692 E6E3 F69B 3FE8 1D85 E93F 801B B43F\"", echo: true
-              sh.cmd 'echo -e "\ndeb https://download.rethinkdb.com/repository/ubuntu-$(lsb_release -cs)/ $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list > /dev/null'
+              sh.cmd "sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \"539A 3A8C 6692 E6E3 F69B 3FE8 1D85 E93F 801B B43F\"", echo: true
+              sh.cmd 'echo -e "\ndeb https://download.rethinkdb.com/repository/ubuntu-$(lsb_release -cs)/ $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list.d/rethinkdb.list > /dev/null'
               sh.cmd 'travis_apt_get_update', assert: false
               sh.cmd "package_version=`apt-cache show rethinkdb | grep -F \"Version: #{rethinkdb_version}\" | sort -r | head -n 1 | awk '{printf $2}'`"
               sh.cmd "apt-get install -y -o Dpkg::Options::='--force-confnew' rethinkdb=$package_version", sudo: true, echo: true, timing: true

public/version-aliases/ghc.json

@@ -115,9 +115,9 @@
   "7.10.2": "7.10.2",
   "7.10.3": "7.10.3",
   "8.0.1": "8.0.1",
-  "8": "8.10.3",
-  "8.x": "8.10.3",
-  "8.x.x": "8.10.3",
+  "8": "8.10.7",
+  "8.x": "8.10.7",
+  "8.x.x": "8.10.7",
   "8.0.x": "8.0.2",
   "8.0": "8.0.2",
   "8.0.2": "8.0.2",
@@ -153,12 +153,25 @@
   "8.8.3": "8.8.3",
   "8.8.4": "8.8.4",
   "8.10.1-alpha1": "8.10.1-alpha1",
-  "8.10": "8.10.3",
+  "8.10": "8.10.7",
   "8.10.1-alpha2": "8.10.1-alpha2",
   "8.10.1": "8.10.1",
-  "8.10.x": "8.10.3",
+  "8.10.x": "8.10.7",
   "8.10.2": "8.10.2",
   "8.10.3": "8.10.3",
+  "8.10.4": "8.10.4",
+  "8.10.5": "8.10.5",
+  "8.10.6": "8.10.6",
+  "8.10.7": "8.10.7",
   "9.0.1-alpha1": "9.0.1-alpha1",
-  "9.0": "9.0.1-alpha1"
-}
+  "9.0": "9.0.1",
+  "9.0.1": "9.0.1",
+  "9": "9.0.1",
+  "9.x": "9.0.1",
+  "9.x.x": "9.0.1",
+  "9.0.x": "9.0.1",
+  "9.2.1-alpha1": "9.2.1-alpha1",
+  "9.2": "9.2.1-alpha2",
+  "9.2.1-alpha2": "9.2.1-alpha2"
+  
+}

spec/build/addons/rethinkdb_spec.rb

@@ -24,7 +24,7 @@
   end
 
   it { should include_sexp [:cmd, "service rethinkdb stop", sudo: true] }
-  it { should include_sexp [:cmd, "sudo apt-key adv --keyserver keys.gnupg.net --recv-keys \"539A 3A8C 6692 E6E3 F69B 3FE8 1D85 E93F 801B B43F\"", echo: true] }
+  it { should include_sexp [:cmd, "sudo apt-key adv --keyserver pgp.mit.edu --recv-keys \"539A 3A8C 6692 E6E3 F69B 3FE8 1D85 E93F 801B B43F\"", echo: true] }
   it { should include_sexp [:cmd, 'echo -e "\ndeb https://download.rethinkdb.com/repository/ubuntu-$(lsb_release -cs)/ $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list > /dev/null'] }
   it { should include_sexp [:cmd, 'travis_apt_get_update'] }
   it { should include_sexp [:cmd, "apt-get install -y -o Dpkg::Options::='--force-confnew' rethinkdb=$package_version", sudo: true, echo: true, timing: true] }