From 0bbbd04107c464c74e7a25f8baccb3e8fa5a87f2 Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Thu, 9 Jan 2020 08:13:03 -0800 Subject: [PATCH] Bump excon from 0.67.0 to 0.71.0 for ci on mac & linux (#48268) --- dev/ci/docker_linux/Dockerfile | 1 + dev/ci/docker_linux/Gemfile | 3 +++ dev/ci/docker_linux/Gemfile.lock | 4 ++-- dev/ci/mac/Gemfile.lock | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dev/ci/docker_linux/Dockerfile b/dev/ci/docker_linux/Dockerfile index 551b630ff8..6a3fe897c4 100644 --- a/dev/ci/docker_linux/Dockerfile +++ b/dev/ci/docker_linux/Dockerfile @@ -127,6 +127,7 @@ ENV LANG en_US.UTF-8 # Skip all the documentation (-N) since it's just on CI. RUN gem install bundler -N +# Gemfile last edited 1/6/2019 (update to trigger a rebuild of Docker image) COPY Gemfile /Gemfile COPY Gemfile.lock /Gemfile.lock diff --git a/dev/ci/docker_linux/Gemfile b/dev/ci/docker_linux/Gemfile index 9b041f8abd..9fdb92a40b 100644 --- a/dev/ci/docker_linux/Gemfile +++ b/dev/ci/docker_linux/Gemfile @@ -1,3 +1,6 @@ +# When editing this file, update the comment starting "# Gemfile last edited" +# in dev/ci/docker_linux/Dockerfile to retrigger a Docker build on Cirrus. + source "https://rubygems.org" # Install fastlane which is used on Linux to build and deploy Android diff --git a/dev/ci/docker_linux/Gemfile.lock b/dev/ci/docker_linux/Gemfile.lock index b3085a24f6..f21f85d4de 100644 --- a/dev/ci/docker_linux/Gemfile.lock +++ b/dev/ci/docker_linux/Gemfile.lock @@ -18,7 +18,7 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) emoji_regex (1.0.1) - excon (0.67.0) + excon (0.71.0) faraday (0.17.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -153,7 +153,7 @@ PLATFORMS ruby DEPENDENCIES - fastlane + fastlane (= 2.134.0) BUNDLED WITH 2.0.2 diff --git a/dev/ci/mac/Gemfile.lock b/dev/ci/mac/Gemfile.lock index 0ab9b30b7d..3a010b33aa 100644 --- a/dev/ci/mac/Gemfile.lock +++ b/dev/ci/mac/Gemfile.lock @@ -63,7 +63,7 @@ GEM dotenv (2.7.5) emoji_regex (1.0.1) escape (0.0.4) - excon (0.67.0) + excon (0.71.0) faraday (0.17.0) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -205,8 +205,10 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.0) xcpretty (~> 0.2, >= 0.0.7) + PLATFORMS ruby + DEPENDENCIES cocoapods fastlane (= 2.134.0)