From a2993ee6f2e44097a76d4991311232fe2c9c865e Mon Sep 17 00:00:00 2001
From: Petros Paraskevopoulos <petros.paraskevopoulos@automattic.com>
Date: Fri, 21 Feb 2025 16:46:02 +0200
Subject: [PATCH] CI: Parametrize scripts for module/build variant (diff merged
 manifest)

---
 .buildkite/commands/diff-merged-manifest.sh    | 18 ++++++++++--------
 .buildkite/commands/restore-merged-manifest.sh |  2 +-
 .buildkite/commands/save-merged-manifest.sh    | 14 ++++++++------
 .buildkite/pipeline.yml                        |  2 +-
 .../schedules/merged-manifest-storage.yml      |  2 +-
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/.buildkite/commands/diff-merged-manifest.sh b/.buildkite/commands/diff-merged-manifest.sh
index 5f2bd7b1228..e4f2b3f055c 100755
--- a/.buildkite/commands/diff-merged-manifest.sh
+++ b/.buildkite/commands/diff-merged-manifest.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
-"$(dirname "${BASH_SOURCE[0]}")/restore-merged-manifest.sh" "WooCommerce" "jalapenoDebug"
+BUILD_VARIANT=$1
 
-"$(dirname "${BASH_SOURCE[0]}")/restore-merged-manifest.sh" "WooCommerce-Wear" "jalapenoDebug"
+"$(dirname "${BASH_SOURCE[0]}")/restore-merged-manifest.sh" "WooCommerce" ${BUILD_VARIANT}
+
+"$(dirname "${BASH_SOURCE[0]}")/restore-merged-manifest.sh" "WooCommerce-Wear" ${BUILD_VARIANT}
 
 "$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
 
@@ -14,12 +16,12 @@ install_gems
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- 📦 Create Merged Manifest"
-./gradlew assembleJalapenoDebug
+echo "--- 📦 Create Merged Manifest (Build Variant: ${BUILD_VARIANT})"
+./gradlew assemble"${BUILD_VARIANT^}"
 echo ""
 
-echo "--- 💾 Diff Merged Manifest for WooCommerce"
-comment_with_manifest_diff "WooCommerce" "jalapenoDebug"
+echo "--- 💾 Diff Merged Manifest (Module: WooCommerce, Build Variant: ${BUILD_VARIANT})"
+comment_with_manifest_diff "WooCommerce" ${BUILD_VARIANT}
 
-echo "--- 💾 Diff Merged Manifest for WooCommerce-Wear"
-comment_with_manifest_diff "WooCommerce-Wear" "jalapenoDebug"
+echo "--- 💾 Diff Merged Manifest (Module: WooCommerce-Wear, Build Variant: ${BUILD_VARIANT})"
+comment_with_manifest_diff "WooCommerce-Wear" ${BUILD_VARIANT}
diff --git a/.buildkite/commands/restore-merged-manifest.sh b/.buildkite/commands/restore-merged-manifest.sh
index 347ed5f2c9b..0b43b89cb4d 100755
--- a/.buildkite/commands/restore-merged-manifest.sh
+++ b/.buildkite/commands/restore-merged-manifest.sh
@@ -3,5 +3,5 @@
 MODULE=$1
 BUILD_VARIANT=$2
 
-echo "--- 💾 Restore Debug Manifest (Jalapeno)"
+echo "--- 💾 Restore Merged Manifest (Module: ${MODULE}, Build Variant: ${BUILD_VARIANT})"
 restore_android_merged_manifest ${MODULE} ${BUILD_VARIANT} || true
diff --git a/.buildkite/commands/save-merged-manifest.sh b/.buildkite/commands/save-merged-manifest.sh
index 2d7518c5d2c..c365462fdd5 100755
--- a/.buildkite/commands/save-merged-manifest.sh
+++ b/.buildkite/commands/save-merged-manifest.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+BUILD_VARIANT=$1
+
 "$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
 
 set -euo pipefail
@@ -10,12 +12,12 @@ install_gems
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- 📦 Create Merged Manifest"
-./gradlew assembleJalapenoDebug
+echo "--- 📦 Create Merged Manifest (Build Variant: ${BUILD_VARIANT})"
+./gradlew assemble"${BUILD_VARIANT^}"
 echo ""
 
-echo "--- 💾 Save Merged Manifest for WooCommerce"
-save_android_merged_manifest "WooCommerce" "jalapenoDebug"
+echo "--- 💾 Save Merged Manifest (Module: WooCommerce, Build Variant: ${BUILD_VARIANT})"
+save_android_merged_manifest "WooCommerce" ${BUILD_VARIANT}
 
-echo "--- 💾 Save Merged Manifest for WooCommerce-Wear"
-save_android_merged_manifest "WooCommerce-Wear" "jalapenoDebug"
+echo "--- 💾 Save Merged Manifest (Module: WooCommerce-Wear, Build Variant: ${BUILD_VARIANT})"
+save_android_merged_manifest "WooCommerce-Wear" ${BUILD_VARIANT}
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 47ba1d5a0b1..58cfc7ec346 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -6,7 +6,7 @@ agents:
 
 steps:
   - label: "💾 Restore and Diff Merged Manifest"
-    command: .buildkite/commands/diff-merged-manifest.sh
+    command: ".buildkite/commands/diff-merged-manifest.sh jalapenoDebug"
     plugins: [$CI_TOOLKIT]
     artifact_paths:
       - "**/build/reports/diff_manifest/*"
diff --git a/.buildkite/schedules/merged-manifest-storage.yml b/.buildkite/schedules/merged-manifest-storage.yml
index 396e9a11fa9..259b95650f8 100644
--- a/.buildkite/schedules/merged-manifest-storage.yml
+++ b/.buildkite/schedules/merged-manifest-storage.yml
@@ -6,5 +6,5 @@ agents:
 
 steps:
   - label: "💾 Create and Store Merged Manifest"
-    command: .buildkite/commands/save-merged-manifest.sh
+    command: ".buildkite/commands/save-merged-manifest.sh jalapenoDebug"
     plugins: [$CI_TOOLKIT]