From 4a8b9a68afbd004eb5b119472258e9de271077f5 Mon Sep 17 00:00:00 2001
From: Petros Paraskevopoulos <petros.paraskevopoulos@automattic.com>
Date: Fri, 21 Feb 2025 14:30:22 +0200
Subject: [PATCH] CI: Extract diff merged manifest script (diff merged
 manifest)

---
 .buildkite/commands/diff-merged-manifest.sh | 25 +++++++++++++++++++++
 .buildkite/pipeline.yml                     |  6 +----
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100755 .buildkite/commands/diff-merged-manifest.sh

diff --git a/.buildkite/commands/diff-merged-manifest.sh b/.buildkite/commands/diff-merged-manifest.sh
new file mode 100755
index 00000000000..5f2bd7b1228
--- /dev/null
+++ b/.buildkite/commands/diff-merged-manifest.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+"$(dirname "${BASH_SOURCE[0]}")/restore-merged-manifest.sh" "WooCommerce" "jalapenoDebug"
+
+"$(dirname "${BASH_SOURCE[0]}")/restore-merged-manifest.sh" "WooCommerce-Wear" "jalapenoDebug"
+
+"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
+
+set -euo pipefail
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- 📦 Create Merged Manifest"
+./gradlew assembleJalapenoDebug
+echo ""
+
+echo "--- 💾 Diff Merged Manifest for WooCommerce"
+comment_with_manifest_diff "WooCommerce" "jalapenoDebug"
+
+echo "--- 💾 Diff Merged Manifest for WooCommerce-Wear"
+comment_with_manifest_diff "WooCommerce-Wear" "jalapenoDebug"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e4f1ddbb57b..47ba1d5a0b1 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,11 +6,7 @@ agents:
 
 steps:
   - label: "💾 Restore and Diff Merged Manifest"
-    command: |
-      ".buildkite/commands/restore-merged-manifest.sh" "WooCommerce" "jalapenoDebug"
-      .buildkite/commands/restore-cache.sh
-      ./gradlew assembleJalapenoDebug
-      "comment_with_manifest_diff" "WooCommerce" "jalapenoDebug"
+    command: .buildkite/commands/diff-merged-manifest.sh
     plugins: [$CI_TOOLKIT]
     artifact_paths:
       - "**/build/reports/diff_manifest/*"