CI: Restore merged manifest with build variant (restore merged manifest)

woocommerce · Feb 21, 2025 · e6603ab · e6603ab
1 parent 501a8d0
commit e6603ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.buildkite/commands/restore-merged-manifest.sh b/.buildkite/commands/restore-merged-manifest.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
 MODULE=$1
+BUILD_VARIANT=$2
 
 echo "--- 💾 Restore Debug Manifest (Jalapeno)"
-restore_android_merged_manifest ${MODULE} || true
+restore_android_merged_manifest ${MODULE} ${BUILD_VARIANT} || true
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -7,10 +7,10 @@ agents:
 steps:
   - label: "💾 Restore and Diff Merged Manifest"
     command: |
+      ".buildkite/commands/restore-merged-manifest.sh" "WooCommerce" "jalapenoDebug"
       .buildkite/commands/restore-cache.sh
       ./gradlew assembleJalapenoDebug
-      ".buildkite/commands/restore-merged-manifest.sh" "WooCommerce"
-      "comment_with_manifest_diff" "WooCommerce"
+      "comment_with_manifest_diff" "WooCommerce" "jalapenoDebug"
     plugins: [$CI_TOOLKIT]
     artifact_paths:
       - "**/build/reports/diff_manifest/*"