From 921527fc8703fa03112147c1e5220dc38828c0b2 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Wed, 27 Dec 2023 12:33:45 -0800
Subject: [PATCH 1/2] Upgrade Xcode CI image from `14.3.1` to `15.1`

---
 .buildkite/cache-builder.yml | 7 ++-----
 .buildkite/pipeline.yml      | 7 ++-----
 .buildkite/release-build.yml | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.buildkite/cache-builder.yml b/.buildkite/cache-builder.yml
index efc0d0513..ba092dadf 100644
--- a/.buildkite/cache-builder.yml
+++ b/.buildkite/cache-builder.yml
@@ -7,13 +7,10 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.15.0
-    - automattic/git-s3-cache#1.1.4:
-        bucket: "a8c-repo-mirrors"
-        repo: "automattic/simplenote-ios/"
+    - automattic/a8c-ci-toolkit#3.0.1
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-14.3.1
+    IMAGE_ID: xcode-15.1
 
 steps:
 
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 5ecfeb6e2..9acc5b91b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -2,13 +2,10 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#3.0.0
-    - automattic/git-s3-cache#1.1.4:
-        bucket: "a8c-repo-mirrors"
-        repo: "automattic/simplenote-ios/"
+    - automattic/a8c-ci-toolkit#3.0.1
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-14.3.1
+    IMAGE_ID: xcode-15.1
 
 # This is the default pipeline – it will build and test the app
 steps:
diff --git a/.buildkite/release-build.yml b/.buildkite/release-build.yml
index 93347d001..085d1bcf6 100644
--- a/.buildkite/release-build.yml
+++ b/.buildkite/release-build.yml
@@ -4,13 +4,10 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.15.1
-    - automattic/git-s3-cache#1.1.4:
-        bucket: "a8c-repo-mirrors"
-        repo: "automattic/simplenote-ios/"
+    - automattic/a8c-ci-toolkit#3.0.1
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-14.3.1
+    IMAGE_ID: xcode-15.1
 
 steps:
 

From 4d9326e55ae441f1d007d07cf13e8a51d0c2b137 Mon Sep 17 00:00:00 2001
From: Spencer Transier <spencer@transier.us>
Date: Wed, 27 Dec 2023 16:32:18 -0800
Subject: [PATCH 2/2] Remove unneeded cache builder

---
 .buildkite/cache-builder.yml | 44 ------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 .buildkite/cache-builder.yml

diff --git a/.buildkite/cache-builder.yml b/.buildkite/cache-builder.yml
deleted file mode 100644
index ba092dadf..000000000
--- a/.buildkite/cache-builder.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-# This script is run via Buildkite's scheduled jobs feature.
-#
-# It's meant to rebuild various CI caches on a periodic async basis, so as
-# not to waste time on every CI job updating the cache.
-
-# Nodes with values to reuse in the pipeline.
-common_params:
-  # Common plugin settings to use with the `plugins` key.
-  - &common_plugins
-    - automattic/a8c-ci-toolkit#3.0.1
-  # Common environment values to use with the `env` key.
-  - &common_env
-    IMAGE_ID: xcode-15.1
-
-steps:
-
-  #################
-  # Build the CocoaPods Base Cache
-  #
-  # This prevents the base cache from infinite growth caused by storing every
-  # version of every pod we've ever used.
-  #################
-  - label: ":cocoapods: Rebuild CocoaPods cache"
-    command: |
-      echo "--- :rubygems: Setting up Gems"
-      install_gems
-
-      echo "--- :cocoapods: Rebuilding Pod Cache"
-      cache_cocoapods_specs_repos
-    env: *common_env
-    plugins: *common_plugins
-
-  #################
-  # Build the Git Repo cache
-  #
-  # Because this repo is so large, we periodically create a Git Mirror and copy it to S3,
-  # from where it can be fetched by agents more quickly than from GitHub, and so that
-  # agents then have less new commits to `git pull` by using that cache as starting point
-  #################
-  - label: ":git: Rebuild git cache"
-    command: "cache_repo a8c-repo-mirrors"
-    plugins: *common_plugins
-    agents:
-      queue: "default"