From d8dd6c190a85810484b18feff3660c537b475d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?=
 <jean-sebastien@rabbitmq.com>
Date: Mon, 12 Oct 2020 17:30:29 +0200
Subject: [PATCH] Travis CI: Update config from rabbitmq-common

---
 deps/rabbitmq_cli/.travis.yml       |  7 ++++---
 deps/rabbitmq_cli/.travis.yml.patch | 25 +++++++++----------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/deps/rabbitmq_cli/.travis.yml b/deps/rabbitmq_cli/.travis.yml
index 3170988d6d..2f53553a2f 100644
--- a/deps/rabbitmq_cli/.travis.yml
+++ b/deps/rabbitmq_cli/.travis.yml
@@ -17,16 +17,17 @@ cache:
   apt: true
 env:
   global:
+
     # $base_rmq_ref is used by rabbitmq-components.mk to select the
     # appropriate branch for dependencies.
     - base_rmq_ref=master
 
 jobs:
   include:
-    - elixir: '1.8'
-      otp_release: '21.3'
     - elixir: '1.10'
-      otp_release: '22.2'
+      otp_release: '22.3'
+    - elixir: '1.10'
+      otp_release: '23.1'
 
 install:
   # This project being an Erlang one (we just set language to Elixir
diff --git a/deps/rabbitmq_cli/.travis.yml.patch b/deps/rabbitmq_cli/.travis.yml.patch
index 2fc704407b..3b85c106c3 100644
--- a/deps/rabbitmq_cli/.travis.yml.patch
+++ b/deps/rabbitmq_cli/.travis.yml.patch
@@ -1,27 +1,20 @@
---- ../rabbit_common/.travis.yml	2020-03-04 16:15:31.047572000 +0100
-+++ .travis.yml	2020-03-06 08:21:14.068094000 +0100
-@@ -17,45 +17,40 @@
-   apt: true
- env:
-   global:
--    - secure: Tu26VJ9BsXxL20xxwWk4cbCkZyqyxYmNpSSqco5r3FLeU5hk5Vkk+s2BareRvqKhKHFlvyxu8GwsKtajMvsieP6y5J99gSeub6fDOIskPz61bo0aKA9nbDuBFSG1Z5wgXx1XRo0yDatLxXCXe3FbThRsylG7XNjtRaru1/lwuVxfxPtBGQ1opvQX71sST3GYSPoBYR+JlcVpU+uDHMAzsP8J0m5rEpxcl821aTMk3iz90hBQMsoLTBmSQePPcNqOA/1OH75VfjuXR8JBXHvA9njrUBrsyxgHf2uOh3jAXdIrHZwZg/17+y7gNVqByfx/UpGb8XEpVkncg/cRyVIHMk7/gFCZkeVC1QkIN5+EPiGLF7u32x9QaT7Zqz57iLh3IJzED2dj12qWaeX8QypF1K1r5qq4pRrN6iEZx76stpZbyFT4XnExHRdzPuouy7yz1gDHF0HOxbNLowzc/jk7tuTp+qmDSR5tRvegAIH3TONegxXyB7smdbvdI6MCN5/GP2bGK7HiqYWCmTGHtJwgxBKc5XoV8ZjpXfKxG98WbK5RsSP1miRnmxSbxaV0Gai1hfFlanJFFxTA9584O+NVRXNNFMfnnt20Ts6OwoXTcJ/boIPjF5Mcm0eJ4nz4R18TArXE4B5S4pTk3eQkG1ACDigkYZ3fc6ws4cWrt8BZASI=
--    - secure: fNEx9OXi2UisiYu0FiHJpV9+vWLB9DIUAIKG24GfUHVgZqFQOInBf5fEYrjlVgm5zNezSBS3hFNHXd/EXJF8KNgbf6mI0z4h4RyyQY98N+78tWvINoIawEeYpgC6NTI52MdaCfV+fTVWhiL0uP7mqWhLmll2bKXIy6HA6I9PnmiQSloNe64vUPF+UsVZHzzeabK4DR2VdI3h+BGXzOY9FG8Kt2voiXOLd2RFpVeN86FDTp+uVZY/K9e/MsktoK+XaZZ4qMAgm6lB32LVkzl3KA9ki6y6BY7le1m2c90hxAtBJGWZptkMb+VL0Fem39nEBnLjE0a0vIddp32PLJQmv6eopMfLay5BIkwtkRwv3P0uCwYd0bgYQSHF/gdTCcK1nr7fMhkQveBh6vmnbhrca7OeQRHz08+jo6EquUgNQZKmTZPWXQn9lS9mU/0EDLJJhn4KhJezGw6DcAAqB0KqmQedxtHMUT87by7LzhINwKZnm4y5WKA/W/zLI6dNqvIgc5C6UJh0EVgxa13GRmrnGmttV1dtLRQhiMJCbJykaekjPMULUmli0RbFz7bSFqFqEUsF+wwovyD+Y6D8KGOJdvvEYPdPIFpRPnhGUvH86JzsFdVKNJBicGI9LpCtlXlWNRbQIQ8uV5ze2HhxSJhtM6e6dB4d9yzpp6a81uR77bk=
--
-     # $base_rmq_ref is used by rabbitmq-components.mk to select the
+--- .travis.yml.orig	2020-10-12 17:29:44.096296000 +0200
++++ .travis.yml	2020-10-12 17:26:40.450974000 +0200
+@@ -22,38 +22,36 @@
      # appropriate branch for dependencies.
      - base_rmq_ref=master
  
 -elixir:
--  - '1.9'
+-  - '1.10'
 -otp_release:
--  - '21.3'
--  - '22.2'
+-  - '22.3'
+-  - '23.1'
 +jobs:
 +  include:
-+    - elixir: '1.8'
-+      otp_release: '21.3'
 +    - elixir: '1.10'
-+      otp_release: '22.2'
++      otp_release: '22.3'
++    - elixir: '1.10'
++      otp_release: '23.1'
  
  install:
    # This project being an Erlang one (we just set language to Elixir