From ceeeedddb0655c8d32235cec3d4914d56d335941 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 18 Jun 2025 10:19:59 +1000
Subject: [PATCH 1/3] DRY `env` definition in CI

---
 .buildkite/pipeline.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 10e07855..76a01fa6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,12 +1,13 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+---
+
+env:
+  IMAGE_ID: xcode-15.3-v3
+
 # Nodes with values to reuse in the pipeline.
 common_params:
   plugins: &common_plugins
     - automattic/a8c-ci-toolkit#3.1.0
-  # Common environment values to use with the `env` key.
-  env: &common_env
-    # -v3 contains a workaround for a Simulator boot issue
-    # See paaHJt-6gL-p2#comment-8712
-    IMAGE_ID: xcode-15.3-v3
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -21,7 +22,6 @@ steps:
       - fastlane/test_output/report.html
       - fastlane/test_output/report.junit
       - .build/derived-data/Logs/**/*.xcactivitylog
-    env: *common_env
     plugins: *common_plugins
 
   #################
@@ -40,7 +40,6 @@ steps:
     key: "lint"
     command: |
       lint_pod
-    env: *common_env
     plugins: *common_plugins
 
   #################
@@ -49,7 +48,6 @@ steps:
   - label: "⬆️ Publish Podspec"
     key: "publish"
     command: .buildkite/publish-pod.sh
-    env: *common_env
     plugins: *common_plugins
     depends_on:
       - "test"

From 650e4d99c3fd8d34223eee387c5df164943436fc Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 18 Jun 2025 10:20:30 +1000
Subject: [PATCH 2/3] Use latest CI toolkit version

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

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 76a01fa6..ca41dea3 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -7,7 +7,7 @@ env:
 # Nodes with values to reuse in the pipeline.
 common_params:
   plugins: &common_plugins
-    - automattic/a8c-ci-toolkit#3.1.0
+    - automattic/a8c-ci-toolkit#3.5.1
 
 # This is the default pipeline – it will build and test the app
 steps:

From 9b995fbbde97156b87b89d9ea6cd360dc9640806 Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Wed, 18 Jun 2025 10:20:58 +1000
Subject: [PATCH 3/3] AINFRA-283 - Set `queue: mac` explicitly in pipeline

This will allow adopting an improved default pipeline upload step on the
CI infrastructure side of the setup. It also makes it clear what queue
is in use just by looking at the pipeline file.

Notice it does not introduce the standard `shared-pipeline-vars` file
because to use that we first need the default pipeline upload step in
the IaC configuration.
---
 .buildkite/pipeline.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ca41dea3..0fba5896 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,6 +1,9 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
 
+agents:
+  queue: mac
+
 env:
   IMAGE_ID: xcode-15.3-v3
 
@@ -54,5 +57,3 @@ steps:
       - "validate"
       - "lint"
     if: build.tag != null
-    agents:
-      queue: "mac"