From 2fe34693cc965d723cf4e726d039e9b91002fc78 Mon Sep 17 00:00:00 2001
From: Gio Lodi <giovanni.lodi42@gmail.com>
Date: Mon, 10 Jan 2022 11:07:20 +0100
Subject: [PATCH 1/5] Use Xcode 13.0 image in Buildkite

---
 .buildkite/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 173862cf..8e17b1db 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -4,7 +4,7 @@ common_params:
   - &bash_cache automattic/bash-cache#v1.3.2: ~
   # Common environment values to use with the `env` key.
   env: &common_env
-    IMAGE_ID: xcode-12.5.1
+    IMAGE_ID: xcode-13
 
 # This is the default pipeline – it will build and test the app
 steps:

From 87b9b6cba8c50d660f00edd1c2bbec97abc6ecb1 Mon Sep 17 00:00:00 2001
From: Gio Lodi <giovanni.lodi42@gmail.com>
Date: Mon, 10 Jan 2022 11:13:53 +0100
Subject: [PATCH 2/5] Bump Buildkite bash cache plugin to latest version 2.0.0

---
 .buildkite/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8e17b1db..1ac222b5 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,7 +1,7 @@
 # Nodes with values to reuse in the pipeline.
 common_params:
   plugins: &common_plugins
-  - &bash_cache automattic/bash-cache#v1.3.2: ~
+  - &bash_cache automattic/bash-cache#2.0.0: ~
   # Common environment values to use with the `env` key.
   env: &common_env
     IMAGE_ID: xcode-13
@@ -13,7 +13,7 @@ steps:
   #################
   - label: "🧪 Build and Test"
     key: "test"
-    command: "build_and_test_pod"
+    command: build_and_test_pod
     env: *common_env
     plugins: *common_plugins
 

From a2ddc396bd5dbab2d8df5032962e286e161dd616 Mon Sep 17 00:00:00 2001
From: Gio Lodi <giovanni.lodi42@gmail.com>
Date: Mon, 10 Jan 2022 11:18:12 +0100
Subject: [PATCH 3/5] Use Ruby 2.7.4

---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 2714f531..a4dd9dba 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.4
+2.7.4

From 7d1f3d865d4375cb2d482fc94f8966e6748342e9 Mon Sep 17 00:00:00 2001
From: Gio Lodi <giovanni.lodi42@gmail.com>
Date: Mon, 10 Jan 2022 11:19:54 +0100
Subject: [PATCH 4/5] Ignore Fastlane generated `README.md`

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 54170b13..9fefe48a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,6 +85,7 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots/**/*.png
 fastlane/test_output
+fastlane/README.md
 
 # rubygems
 vendor/

From a67bd0603c1e80abe4030aee76b5fdb41608ec79 Mon Sep 17 00:00:00 2001
From: Gio Lodi <giovanni.lodi42@gmail.com>
Date: Mon, 10 Jan 2022 11:31:04 +0100
Subject: [PATCH 5/5] Add step attempting to fix the Bundler setup to avoid a
 CI error

See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
---
 .buildkite/pipeline.yml   | 18 +++++++++++++++---
 .buildkite/publish-pod.sh |  3 +++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1ac222b5..2ffe5308 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -13,7 +13,11 @@ steps:
   #################
   - label: "🧪 Build and Test"
     key: "test"
-    command: build_and_test_pod
+    command: |
+      # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+      gem install bundler:2.3.4
+
+      build_and_test_pod
     env: *common_env
     plugins: *common_plugins
 
@@ -22,7 +26,11 @@ steps:
   #################
   - label: "🔬 Validate Podspec"
     key: "validate"
-    command: "validate_podspec"
+    command: |
+      # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+      gem install bundler:2.3.4
+
+      validate_podspec
     env: *common_env
     plugins: *common_plugins
 
@@ -31,7 +39,11 @@ steps:
   #################
   - label: "🧹 Lint"
     key: "lint"
-    command: "lint_pod"
+    command: |
+      # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+      gem install bundler:2.3.4
+
+      lint_pod
     env: *common_env
     plugins: *common_plugins
 
diff --git a/.buildkite/publish-pod.sh b/.buildkite/publish-pod.sh
index 8bc6425d..2ef6b26e 100755
--- a/.buildkite/publish-pod.sh
+++ b/.buildkite/publish-pod.sh
@@ -5,6 +5,9 @@ SPECS_REPO="git@github.com:wordpress-mobile/cocoapods-specs.git"
 SLACK_WEBHOOK=$PODS_SLACK_WEBHOOK
 
 echo "--- :rubygems: Setting up Gems"
+# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+gem install bundler:2.3.4
+
 install_gems
 
 echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"