From 0e4c0ba8357841592bc6978ea3a8508fce141e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?=
 <jean-sebastien@rabbitmq.com>
Date: Wed, 4 Mar 2020 14:24:22 +0100
Subject: [PATCH] Travis CI: Update config from rabbitmq-common

---
 deps/amqp_client/.travis.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/deps/amqp_client/.travis.yml b/deps/amqp_client/.travis.yml
index a42f293911..dd70612549 100644
--- a/deps/amqp_client/.travis.yml
+++ b/deps/amqp_client/.travis.yml
@@ -31,11 +31,20 @@ otp_release:
   - '22.2'
 
 install:
-  - mix local.hex --force
+  # This project being an Erlang one (we just set language to Elixir
+  # to ensure it is installed), we don't want Travis to run mix(1)
+  # automatically as it will break.
+  skip
 
 script:
+  # $current_rmq_ref is also used by rabbitmq-components.mk to select
+  # the appropriate branch for dependencies.
+  - make check-rabbitmq-components.mk
+    current_rmq_ref="${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}"
   - make xref
+    current_rmq_ref="${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}"
   - make tests
+    current_rmq_ref="${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}"
 
 after_failure:
   - |