From 03c55232b559e625bb6fc3fbdf888425766ff7b5 Mon Sep 17 00:00:00 2001
From: Olivier Halligon <olivier.halligon@automattic.com>
Date: Wed, 3 Dec 2025 02:18:25 +0100
Subject: [PATCH 1/3] Migrate to `shared-pipeline-vars`

---
 .buildkite/pipeline.yml         | 27 +++++++++++----------------
 .buildkite/shared-pipeline-vars |  7 +++++++
 2 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 .buildkite/shared-pipeline-vars

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 420f58e44..69df6950b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,18 +1,8 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 ---
-# Nodes with values to reuse in the pipeline.
-common_params:
-  env: &xcode_image
-    IMAGE_ID: xcode-16.1
-  plugins:
-    - &ci_toolkit
-      automattic/a8c-ci-toolkit#3.7.1: ~
-    - &docker_plugin
-      docker#v5.8.0:
-        image: &ruby_version "public.ecr.aws/docker/library/ruby:3.2.2"
-        propagate-environment: true
-        environment:
-          - "RUBYGEMS_API_KEY"
+
+env:
+  IMAGE_ID: $IMAGE_ID
 
 steps:
   #################
@@ -39,8 +29,7 @@ steps:
 
           echo "--- :rspec: Run Rspec"
           bundle exec rspec --profile 10 --format progress
-        env: *xcode_image
-        plugins: [*ci_toolkit]
+        plugins: [$CI_TOOLKIT]
         agents:
           queue: "mac"
         matrix:
@@ -60,7 +49,13 @@ steps:
     # commands written inline) to avoid leaking a key used in the process in clear in the
     # BUILDKITE_COMMAND environment variable.
     command: .buildkite/commands/gem-push.sh
-    plugins: [*docker_plugin]
+    plugins:
+      - $DOCKER_PLUGIN:
+          image: "$DOCKER_RUBY_IMAGE"
+          propagate-environment: true
+          environment:
+            - "RUBYGEMS_API_KEY"
+
     agents:
       queue: "default"
 
diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars
new file mode 100644
index 000000000..5d8804d8c
--- /dev/null
+++ b/.buildkite/shared-pipeline-vars
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export IMAGE_ID="xcode-26.1.1"
+export CI_TOOLKIT="automattic/a8c-ci-toolkit#3.7.1"
+export DOCKER_PLUGIN="docker#v5.8.0"
+export RUBY_VERSION="3.2.2"
+export DOCKER_RUBY_IMAGE="public.ecr.aws/docker/library/ruby:$RUBY_VERSION"

From 15f971d0c6a1a51823765e0b99deb0e4a8c86fee Mon Sep 17 00:00:00 2001
From: Olivier Halligon <olivier.halligon@automattic.com>
Date: Wed, 3 Dec 2025 02:20:00 +0100
Subject: [PATCH 2/3] Update `ci-toolkit` and `docker` plugin

---
 .buildkite/pipeline.yml         | 2 +-
 .buildkite/shared-pipeline-vars | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 69df6950b..7941d7f6d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -35,7 +35,7 @@ steps:
         matrix:
           setup:
             ruby:
-              - 3.2.2
+              - "$RUBY_VERSION"
 
   #################
   # Push to RubyGems
diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars
index 5d8804d8c..262e8ef86 100644
--- a/.buildkite/shared-pipeline-vars
+++ b/.buildkite/shared-pipeline-vars
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export IMAGE_ID="xcode-26.1.1"
-export CI_TOOLKIT="automattic/a8c-ci-toolkit#3.7.1"
-export DOCKER_PLUGIN="docker#v5.8.0"
+export CI_TOOLKIT="automattic/a8c-ci-toolkit#5.7.0"
+export DOCKER_PLUGIN="docker#v5.13.0"
 export RUBY_VERSION="3.2.2"
 export DOCKER_RUBY_IMAGE="public.ecr.aws/docker/library/ruby:$RUBY_VERSION"

From 51f4e46d12b1fa1c7be72a1038b2c75340b7e38a Mon Sep 17 00:00:00 2001
From: Olivier Halligon <olivier.halligon@automattic.com>
Date: Wed, 3 Dec 2025 02:25:17 +0100
Subject: [PATCH 3/3] Add CHANGELOG entry

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 341d2ca39..cc16debd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ _None_
 
 ### New Features
 
-- `upload_build_to_apps_cdn`: Add additional Sparkle meta fields `critical_update` and `phased_rollout_interval` [#673]
+- `upload_build_to_apps_cdn`: Add additional Sparkle meta fields `critical_update` and `phased_rollout_interval`. [#673]
 
 ### Bug Fixes
 
@@ -18,7 +18,7 @@ _None_
 
 ### Internal Changes
 
-_None_
+- Updated CI pipeline (Xcode VM used for builds, ci-toolkit plugin, docker plugin). [#677]
 
 ## 13.7.0