From 6e8143f49349d13aa6bb1acf3158fabf4fc06508 Mon Sep 17 00:00:00 2001 From: Olivier Halligon Date: Mon, 15 Apr 2024 18:55:50 +0200 Subject: [PATCH] Make pod trunk push be --synchronous To prevent the Editor pod to fail to be pushed to trunk if the Aztec pod it depends on hasn't propagated through the CDN yet --- .buildkite/pipeline.yml | 2 +- .buildkite/publish-aztec-pod.sh | 5 ++++- .buildkite/publish-editor.pod.sh | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index b19eab5c6..a2cbd010f 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.3.0 # Common environment values to use with the `env` key. env: &common_env IMAGE_ID: xcode-13 diff --git a/.buildkite/publish-aztec-pod.sh b/.buildkite/publish-aztec-pod.sh index a0beab3ba..a66222ebd 100644 --- a/.buildkite/publish-aztec-pod.sh +++ b/.buildkite/publish-aztec-pod.sh @@ -8,7 +8,10 @@ echo "--- :rubygems: Setting up Gems" install_gems echo "--- :cocoapods: Publishing Pod to CocoaPods CDN" -publish_pod $PODSPEC_PATH +# Using `--synchronous` here because Editor depends on Aztec, and we need +# to be able to `pod trunk push` the Editor pod immediately after the Aztec +# pod has been published, without being hindered by the CDN propagation time. +publish_pod --synchronous $PODSPEC_PATH echo "--- :cocoapods: Publishing Pod to WP Specs Repo" publish_private_pod $PODSPEC_PATH $SPECS_REPO "$SPEC_REPO_PUBLIC_DEPLOY_KEY" diff --git a/.buildkite/publish-editor.pod.sh b/.buildkite/publish-editor.pod.sh index 68dbb507c..98c6cc707 100644 --- a/.buildkite/publish-editor.pod.sh +++ b/.buildkite/publish-editor.pod.sh @@ -8,7 +8,10 @@ echo "--- :rubygems: Setting up Gems" install_gems echo "--- :cocoapods: Publishing Pod to CocoaPods CDN" -publish_pod $PODSPEC_PATH +# Using `--synchronous` here because Editor depends on Aztec, and we need +# to be able to `pod trunk push` the Editor pod immediately after the Aztec +# pod has been published, without being hindered by the CDN propagation time. +publish_pod --synchronous $PODSPEC_PATH echo "--- :cocoapods: Publishing Pod to WP Specs Repo" publish_private_pod $PODSPEC_PATH $SPECS_REPO "$SPEC_REPO_PUBLIC_DEPLOY_KEY"