Merge branch 'master' into rhel8

Author: GbArc

lib/travis/build/bash/travis_install_jdk.bash

@@ -27,7 +27,7 @@ travis_install_jdk_ext_provider() {
   mkdir -p ~/bin
   url="https://$TRAVIS_APP_HOST/files/install-jdk.sh"
   if ! travis_download "$url" ~/bin/install-jdk.sh; then
-    url="https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh"
+    url="https://raw.githubusercontent.com/sormuras/bach/releases/11/install-jdk.sh"
     travis_download "$url" ~/bin/install-jdk.sh || {
       echo "${ANSI_RED}Could not acquire install-jdk.sh. Stopping build.${ANSI_RESET}" >/dev/stderr
       travis_terminate 2

public/version-aliases/ghc.json

@@ -164,14 +164,17 @@
   "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",
+  "9.0": "9.0.2",
   "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": "9.2.2",
+  "9.x": "9.2.2",
+  "9.x.x": "9.2.2",
+  "9.0.x": "9.0.2",
+  "9.0.2": "9.0.2",
   "9.2.1-alpha1": "9.2.1-alpha1",
-  "9.2": "9.2.1-alpha2",
-  "9.2.1-alpha2": "9.2.1-alpha2"
-  
-}
+  "9.2": "9.2.2",
+  "9.2.1-alpha2": "9.2.1-alpha2",
+  "9.2.1": "9.2.1",
+  "9.2.x": "9.2.2",
+  "9.2.2": "9.2.2"
+}

spec/build/addons/rethinkdb_spec.rb

@@ -24,8 +24,8 @@
   end
 
   it { should include_sexp [:cmd, "service rethinkdb stop", sudo: 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, "sudo apt-key adv --keyserver keyserver.ubuntu.com --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.d/rethinkdb.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] }
   it { should include_sexp [:cmd, "cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/default.conf", sudo: true] }