From f22f2bf5612b2d1f1b41bf27d646df5bd80c5dfa Mon Sep 17 00:00:00 2001
From: Gio Lodi <gio@mokacoding.com>
Date: Mon, 22 Jan 2024 12:15:19 +1100
Subject: [PATCH] Update `a8c-ci-toolkit` to workaround CocoaPods issue

---
 .buildkite/pipeline.yml   | 21 ++++++---------------
 .buildkite/publish-pod.sh |  6 +++---
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1f564bc..17f039b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,7 +1,7 @@
 # Nodes with values to reuse in the pipeline.
 common_params:
   plugins: &common_plugins
-    - automattic/a8c-ci-toolkit#2.13.0
+    - automattic/a8c-ci-toolkit#3.0.1
   env: &common_env
     IMAGE_ID: xcode-15.0.1
 
@@ -12,11 +12,10 @@ steps:
   ########################
   - label: "🔬 Validate Swift Package"
     key: "test"
-    command: |
-      validate_swift_package
+    command: validate_swift_package
     env: *common_env
     plugins: *common_plugins
-    artifact_paths: 
+    artifact_paths:
       - .build/logs/*.log
       - .build/derived-data/Logs/**/*.xcactivitylog
 
@@ -25,13 +24,7 @@ steps:
   #################
   - label: "🔬 Validate Podspec"
     key: "validate"
-    command: |
-      # validate_podspec
-      echo '+++ ⚠️ validate_podspec was bypassed ⚠️'
-      # post a message in the logs
-      cat .buildkite/validate_podspec_annotation.md
-      # and also as an annotation
-      cat .buildkite/validate_podspec_annotation.md | buildkite-agent annotate --style 'warning'
+    command: validate_podspec --patch-cocoapods
     env: *common_env
     plugins: *common_plugins
     artifact_paths: ".build/logs/*.log"
@@ -41,8 +34,7 @@ steps:
   #################
   - label: "🧹 Lint"
     key: "lint"
-    command: |
-      lint_pod
+    command: lint_pod
     env: *common_env
     plugins: *common_plugins
 
@@ -51,8 +43,7 @@ steps:
   #################
   - label: "⬆️ Publish Podspec"
     key: "publish"
-    command: |
-      .buildkite/publish-pod.sh
+    command: .buildkite/publish-pod.sh
     env: *common_env
     plugins: *common_plugins
     depends_on:
diff --git a/.buildkite/publish-pod.sh b/.buildkite/publish-pod.sh
index b5f8bcb..3c7f2e6 100644
--- a/.buildkite/publish-pod.sh
+++ b/.buildkite/publish-pod.sh
@@ -8,10 +8,10 @@ echo "--- :rubygems: Setting up Gems"
 install_gems
 
 echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"
-publish_pod $PODSPEC_PATH
+publish_pod --patch-cocoapods $PODSPEC_PATH
 
 echo "--- :cocoapods: Publishing Pod to WP Specs Repo"
-publish_private_pod $PODSPEC_PATH $SPECS_REPO "$SPEC_REPO_PUBLIC_DEPLOY_KEY"
+publish_private_pod --patch-cocoapods $PODSPEC_PATH $SPECS_REPO "$SPEC_REPO_PUBLIC_DEPLOY_KEY"
 
 echo "--- :slack: Notifying Slack"
-slack_notify_pod_published $PODSPEC_PATH $SLACK_WEBHOOK
+slack_notify_pod_published $PODSPEC_PATH "$SLACK_WEBHOOK"