Merge pull request #13637 from woocommerce/manifest/reveal-changes-in…

…-pr-v2

[AndroidManifest] Reveal Manifest Changes in PR (`V2`)

.buildkite/commands/diff-merged-manifest.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -euo pipefail
+
+"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh"
+
+BUILD_VARIANT=$1
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
+
+echo "--- 💾 Diff Merged Manifest (Module: WooCommerce, Build Variant: ${BUILD_VARIANT})"
+comment_with_manifest_diff "WooCommerce" ${BUILD_VARIANT}
+
+echo "--- 💾 Diff Merged Manifest (Module: WooCommerce-Wear, Build Variant: ${BUILD_VARIANT})"
+comment_with_manifest_diff "WooCommerce-Wear" ${BUILD_VARIANT}

.buildkite/pipeline.yml

@@ -53,6 +53,13 @@ steps:
         artifact_paths:
           - "**/build/reports/diff/*"
 
+      - label: "Merged Manifest Diff"
+        command: ".buildkite/commands/diff-merged-manifest.sh vanillaRelease"
+        if: build.pull_request.id != null
+        plugins: [$CI_TOOLKIT]
+        artifact_paths:
+          - "**/build/reports/diff_manifest/**/**/*"
+
   ########################################
   - group: "🛠 Prototype Builds"
     steps:

.buildkite/shared-pipeline-vars

@@ -3,5 +3,5 @@
 # This file is `source`'d before calling `buildkite-agent pipeline upload`, and can be used
 # to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
 
-export CI_TOOLKIT="automattic/a8c-ci-toolkit#3.10.1"
+export CI_TOOLKIT="automattic/a8c-ci-toolkit#5.1.2"
 export TEST_COLLECTOR="test-collector#v1.10.1"