From 29e5c47b6d8415558e784d5dce4b099569b49e43 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Tue, 18 Feb 2025 16:52:50 +0200 Subject: [PATCH 01/15] CI: Update a8c-ci-toolkit to pr-sha commit (save merged manifest) --- .buildkite/shared-pipeline-vars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars index 270d8cb5e0c..57836205396 100644 --- a/.buildkite/shared-pipeline-vars +++ b/.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#a960f3bdd9458095a971116c6bdbae0b57f3ed11" export TEST_COLLECTOR="test-collector#v1.10.1" From 1d65933a232efd05fe3b371d1a3923af7d1d215c Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Tue, 18 Feb 2025 16:50:40 +0200 Subject: [PATCH 02/15] CI: Save merged manifest via scheduled build (save merged manifest) --- .buildkite/commands/save-merged-manifest.sh | 18 +++++++++++++++ .../schedules/merged-manifest-storage.yml | 22 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100755 .buildkite/commands/save-merged-manifest.sh create mode 100644 .buildkite/schedules/merged-manifest-storage.yml diff --git a/.buildkite/commands/save-merged-manifest.sh b/.buildkite/commands/save-merged-manifest.sh new file mode 100755 index 00000000000..7177261cb5b --- /dev/null +++ b/.buildkite/commands/save-merged-manifest.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh" + +set -euo pipefail + +echo "--- :rubygems: Setting up Gems" +install_gems + +echo "--- :closed_lock_with_key: Installing Secrets" +bundle exec fastlane run configure_apply + +echo "--- 📦 Create Debug Manifest (Jalapeno)" +./gradlew assembleJalapenoDebug +echo "" + +echo "--- 💾 Save Debug Manifest (Jalapeno)" +save_android_merged_manifest "WooCommerce" diff --git a/.buildkite/schedules/merged-manifest-storage.yml b/.buildkite/schedules/merged-manifest-storage.yml new file mode 100644 index 00000000000..b9a10db41e3 --- /dev/null +++ b/.buildkite/schedules/merged-manifest-storage.yml @@ -0,0 +1,22 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json +--- + +agents: + queue: "android" + +steps: + - label: "💾 Create and Store Merged Manifest" + command: .buildkite/commands/save-merged-manifest.sh + plugins: [$CI_TOOLKIT] + +#notify: +# - slack: +# channels: +# - "#android-core-notifs" +# message: "The manifest cache has been updated." +# if: build.state == "passed" +# - slack: +# channels: +# - "#android-core-notifs" +# message: "Failure to update the manifest cache." +# if: build.state == "failed" From e125094046cfa8a9dcf6a887635795ac5c6ac77b Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 19 Feb 2025 15:49:44 +0200 Subject: [PATCH 03/15] CI: Update a8c-ci-toolkit to pr-sha commit (restore merged manifest) --- .buildkite/shared-pipeline-vars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars index 57836205396..8251755e50b 100644 --- a/.buildkite/shared-pipeline-vars +++ b/.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#a960f3bdd9458095a971116c6bdbae0b57f3ed11" +export CI_TOOLKIT="automattic/a8c-ci-toolkit#5752276cbdf0bda9c4141dc568a74136b355b9c7" export TEST_COLLECTOR="test-collector#v1.10.1" From 092b40febd5d148880ec914a1ac47418855dacfa Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 19 Feb 2025 15:44:43 +0200 Subject: [PATCH 04/15] CI: Restore merged manifest via pipeline build (restore merged manifest) --- .../commands/restore-merged-manifest.sh | 6 ++ .buildkite/pipeline.yml | 91 ++----------------- 2 files changed, 12 insertions(+), 85 deletions(-) create mode 100755 .buildkite/commands/restore-merged-manifest.sh diff --git a/.buildkite/commands/restore-merged-manifest.sh b/.buildkite/commands/restore-merged-manifest.sh new file mode 100755 index 00000000000..567fcb4a0bf --- /dev/null +++ b/.buildkite/commands/restore-merged-manifest.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e + +MODULE=$1 + +echo "--- 💾 Restore Debug Manifest (Jalapeno)" +restore_android_merged_manifest ${MODULE} || true diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 02cc3a2b6b0..621003b23b7 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,92 +1,13 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json --- -# Nodes with values to reuse in the pipeline. -common_params: - # Common plugin settings to use with the `plugins` key. - - &test_collector_common_params - files: "WooCommerce/build/buildkite-test-analytics/*.xml" - format: "junit" - agents: queue: "android" steps: - - label: Gradle Wrapper Validation - command: validate_gradle_wrapper - agents: - queue: linter - - # Wait for Gradle Wrapper to be validated before running any other jobs - - wait - - ######################################## - - group: "🕵️ Linters" - steps: - - - label: "☢️ Danger - PR Check" - command: danger - key: danger - if: "build.pull_request.id != null" - retry: - manual: - permit_on_passed: true - agents: - queue: "linter" - - - label: "detekt" - command: ./gradlew detektAll - plugins: [$CI_TOOLKIT] - artifact_paths: - - "**/build/reports/detekt/detekt.html" - - - label: "lint" - command: .buildkite/commands/lint.sh - plugins: [$CI_TOOLKIT] - artifact_paths: - - "**/build/reports/lint-results*.*" - - - label: "Dependency Tree Diff" - command: comment_with_dependency_diff 'woocommerce' 'vanillaReleaseRuntimeClasspath' - if: build.pull_request.id != null - plugins: [$CI_TOOLKIT] - artifact_paths: - - "**/build/reports/diff/*" - - ######################################## - - group: "🛠 Prototype Builds" - steps: - - - label: "🛠 Prototype Build: Mobile App" - command: ".buildkite/commands/prototype-build.sh WooCommerce" - if: build.pull_request.id != null - plugins: [$CI_TOOLKIT] - - - label: "🛠 Prototype Build: Wear App" - command: ".buildkite/commands/prototype-build.sh WooCommerce-Wear" - if: build.pull_request.id != null - plugins: [$CI_TOOLKIT] - - ######################################## - - group: "🔬 Tests" - steps: - - - label: "Unit tests" - command: .buildkite/commands/run-unit-tests.sh - plugins: - - $CI_TOOLKIT - - $TEST_COLLECTOR : - <<: *test_collector_common_params - api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_UNIT_TESTS" - artifact_paths: - - "**/build/test-results/merged-test-results.xml" - - - label: "Instrumented tests" - command: .buildkite/commands/run-instrumented-tests.sh - plugins: - - $CI_TOOLKIT - - $TEST_COLLECTOR : - <<: *test_collector_common_params - api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS" - artifact_paths: - - "**/build/instrumented-tests/**/*" + - label: "💾 Restore and Diff Merged Manifest" + command: | + .buildkite/commands/restore-cache.sh + ./gradlew assembleJalapenoDebug + ".buildkite/commands/restore-merged-manifest.sh" "WooCommerce" + plugins: [$CI_TOOLKIT] From 6168a04cffe5bbb4f52e724a201f5f5395dc46c0 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 20 Feb 2025 16:24:00 +0200 Subject: [PATCH 05/15] CI: Update a8c-ci-toolkit to pr-sha commit (diff merged manifest) --- .buildkite/shared-pipeline-vars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars index 8251755e50b..6478ae9528e 100644 --- a/.buildkite/shared-pipeline-vars +++ b/.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#5752276cbdf0bda9c4141dc568a74136b355b9c7" +export CI_TOOLKIT="automattic/a8c-ci-toolkit#6a3263debb8d0644bb1d1b37986757f10e3f2dc0" export TEST_COLLECTOR="test-collector#v1.10.1" From 8cae53e7211c354beda3a64b58a2c7fbd2f6bc4c Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 20 Feb 2025 16:25:44 +0200 Subject: [PATCH 06/15] CI: Diff merged manifest via pipeline build (diff merged manifest) --- .buildkite/pipeline.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 621003b23b7..a2d7bba995b 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -10,4 +10,7 @@ steps: .buildkite/commands/restore-cache.sh ./gradlew assembleJalapenoDebug ".buildkite/commands/restore-merged-manifest.sh" "WooCommerce" + "comment_with_manifest_diff" "WooCommerce" plugins: [$CI_TOOLKIT] + artifact_paths: + - "**/build/reports/diff_manifest/*" From 43a998971de51970ca32c5b75e14bcfa86679b70 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 20 Feb 2025 18:26:09 +0200 Subject: [PATCH 07/15] CI: Update a8c-ci-toolkit to pr-sha commit (manifest with build variant) --- .buildkite/shared-pipeline-vars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars index 6478ae9528e..53621522e9d 100644 --- a/.buildkite/shared-pipeline-vars +++ b/.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#6a3263debb8d0644bb1d1b37986757f10e3f2dc0" +export CI_TOOLKIT="automattic/a8c-ci-toolkit#9cfd01c83dadc5932c05462c617816715a1c98f7" export TEST_COLLECTOR="test-collector#v1.10.1" From ff780caaa779dbe3f195f792ec236fdd258fecc5 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Thu, 20 Feb 2025 18:27:20 +0200 Subject: [PATCH 08/15] CI: Save merged manifest with build variant (save merged manifest) --- .buildkite/commands/save-merged-manifest.sh | 9 ++++++--- .buildkite/schedules/merged-manifest-storage.yml | 12 ------------ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.buildkite/commands/save-merged-manifest.sh b/.buildkite/commands/save-merged-manifest.sh index 7177261cb5b..2d7518c5d2c 100755 --- a/.buildkite/commands/save-merged-manifest.sh +++ b/.buildkite/commands/save-merged-manifest.sh @@ -10,9 +10,12 @@ install_gems echo "--- :closed_lock_with_key: Installing Secrets" bundle exec fastlane run configure_apply -echo "--- 📦 Create Debug Manifest (Jalapeno)" +echo "--- 📦 Create Merged Manifest" ./gradlew assembleJalapenoDebug echo "" -echo "--- 💾 Save Debug Manifest (Jalapeno)" -save_android_merged_manifest "WooCommerce" +echo "--- 💾 Save Merged Manifest for WooCommerce" +save_android_merged_manifest "WooCommerce" "jalapenoDebug" + +echo "--- 💾 Save Merged Manifest for WooCommerce-Wear" +save_android_merged_manifest "WooCommerce-Wear" "jalapenoDebug" diff --git a/.buildkite/schedules/merged-manifest-storage.yml b/.buildkite/schedules/merged-manifest-storage.yml index b9a10db41e3..396e9a11fa9 100644 --- a/.buildkite/schedules/merged-manifest-storage.yml +++ b/.buildkite/schedules/merged-manifest-storage.yml @@ -8,15 +8,3 @@ steps: - label: "💾 Create and Store Merged Manifest" command: .buildkite/commands/save-merged-manifest.sh plugins: [$CI_TOOLKIT] - -#notify: -# - slack: -# channels: -# - "#android-core-notifs" -# message: "The manifest cache has been updated." -# if: build.state == "passed" -# - slack: -# channels: -# - "#android-core-notifs" -# message: "Failure to update the manifest cache." -# if: build.state == "failed" From 2a17b40f316f2bc0118dee23bee3fd8ddb365b09 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 21 Feb 2025 13:37:21 +0200 Subject: [PATCH 09/15] CI: Restore merged manifest with build variant (restore merged manifest) --- .buildkite/commands/restore-merged-manifest.sh | 3 ++- .buildkite/pipeline.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.buildkite/commands/restore-merged-manifest.sh b/.buildkite/commands/restore-merged-manifest.sh index 567fcb4a0bf..347ed5f2c9b 100755 --- 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 index a2d7bba995b..e4f1ddbb57b 100644 --- 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/*" From 780f4c77abe2602e0a0318ef3932dfeed2b6bceb Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 21 Feb 2025 14:30:22 +0200 Subject: [PATCH 10/15] CI: Extract diff merged manifest script (diff merged manifest) --- .buildkite/commands/diff-merged-manifest.sh | 25 +++++++++++++++++++++ .buildkite/pipeline.yml | 6 +---- 2 files changed, 26 insertions(+), 5 deletions(-) create mode 100755 .buildkite/commands/diff-merged-manifest.sh diff --git a/.buildkite/commands/diff-merged-manifest.sh b/.buildkite/commands/diff-merged-manifest.sh new file mode 100755 index 00000000000..5f2bd7b1228 --- /dev/null +++ b/.buildkite/commands/diff-merged-manifest.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +"$(dirname "${BASH_SOURCE[0]}")/restore-merged-manifest.sh" "WooCommerce" "jalapenoDebug" + +"$(dirname "${BASH_SOURCE[0]}")/restore-merged-manifest.sh" "WooCommerce-Wear" "jalapenoDebug" + +"$(dirname "${BASH_SOURCE[0]}")/restore-cache.sh" + +set -euo pipefail + +echo "--- :rubygems: Setting up Gems" +install_gems + +echo "--- :closed_lock_with_key: Installing Secrets" +bundle exec fastlane run configure_apply + +echo "--- 📦 Create Merged Manifest" +./gradlew assembleJalapenoDebug +echo "" + +echo "--- 💾 Diff Merged Manifest for WooCommerce" +comment_with_manifest_diff "WooCommerce" "jalapenoDebug" + +echo "--- 💾 Diff Merged Manifest for WooCommerce-Wear" +comment_with_manifest_diff "WooCommerce-Wear" "jalapenoDebug" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index e4f1ddbb57b..47ba1d5a0b1 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -6,11 +6,7 @@ agents: steps: - label: "💾 Restore and Diff Merged Manifest" - command: | - ".buildkite/commands/restore-merged-manifest.sh" "WooCommerce" "jalapenoDebug" - .buildkite/commands/restore-cache.sh - ./gradlew assembleJalapenoDebug - "comment_with_manifest_diff" "WooCommerce" "jalapenoDebug" + command: .buildkite/commands/diff-merged-manifest.sh plugins: [$CI_TOOLKIT] artifact_paths: - "**/build/reports/diff_manifest/*" From a8c288ba799ae7709065c00aed7d02442731026d Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 21 Feb 2025 16:46:02 +0200 Subject: [PATCH 11/15] 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] From f4eac59dc58e2360de7ec50817199211718fb5e9 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 21 Feb 2025 17:00:48 +0200 Subject: [PATCH 12/15] CI: Update a8c-ci-toolkit to pr-sha commit (multi comment diffs) --- .buildkite/pipeline.yml | 2 +- .buildkite/shared-pipeline-vars | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 58cfc7ec346..9a60f234d00 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -9,4 +9,4 @@ steps: command: ".buildkite/commands/diff-merged-manifest.sh jalapenoDebug" plugins: [$CI_TOOLKIT] artifact_paths: - - "**/build/reports/diff_manifest/*" + - "**/build/reports/diff_manifest/**/**/*" diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars index 53621522e9d..7e6f6b1c2f8 100644 --- a/.buildkite/shared-pipeline-vars +++ b/.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#9cfd01c83dadc5932c05462c617816715a1c98f7" +export CI_TOOLKIT="automattic/a8c-ci-toolkit#4d25f6ab2cfa9ccacee72d1c44a1ed1189a589f0" export TEST_COLLECTOR="test-collector#v1.10.1" From 545e8742d0613d952a74de44cc0e51c13235a943 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 26 Feb 2025 17:47:16 +0200 Subject: [PATCH 13/15] CI: Use process manifest instead of assemble to create the manifest --- .buildkite/commands/diff-merged-manifest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/commands/diff-merged-manifest.sh b/.buildkite/commands/diff-merged-manifest.sh index e4f2b3f055c..6e63cb0c22f 100755 --- a/.buildkite/commands/diff-merged-manifest.sh +++ b/.buildkite/commands/diff-merged-manifest.sh @@ -17,7 +17,7 @@ echo "--- :closed_lock_with_key: Installing Secrets" bundle exec fastlane run configure_apply echo "--- 📦 Create Merged Manifest (Build Variant: ${BUILD_VARIANT})" -./gradlew assemble"${BUILD_VARIANT^}" +./gradlew process"${BUILD_VARIANT^}"Manifest echo "" echo "--- 💾 Diff Merged Manifest (Module: WooCommerce, Build Variant: ${BUILD_VARIANT})" From 79c4ff06d4ce20f77e2f134bf4ae3133bdc80c0b Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 26 Feb 2025 17:54:33 +0200 Subject: [PATCH 14/15] Deps: Add singular dependency (woocommerce) --- WooCommerce/build.gradle | 1 + gradle/libs.versions.toml | 2 ++ settings.gradle | 3 +++ 3 files changed, 6 insertions(+) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index a1ad86cf3a8..aed88ddbc8b 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -438,6 +438,7 @@ dependencies { implementation(libs.google.protobuf.javalite) lintChecks(libs.android.security.lint) + implementation(libs.singular) } protobuf { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1abe896283a..5e0fcace87d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -89,6 +89,7 @@ mpandroidchart = 'v3.1.0' photoview = '2.3.0' robolectric = "4.11" sentry = '4.10.0' +singular = "12.6.1" squareup-javapoet = "1.7.0" squareup-leakcanary = '2.14' squareup-okhttp3 = "4.9.0" @@ -251,6 +252,7 @@ mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", versio mpandroidchart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref = "mpandroidchart" } photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref = "photoview" } robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } +singular = { module = "com.singular.sdk:singular_sdk", version.ref = "singular" } squareup-javapoet = { module = "com.squareup:javapoet", version.ref = "squareup-javapoet" } squareup-leakcanary-android = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "squareup-leakcanary" } squareup-okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "squareup-okhttp3" } diff --git a/settings.gradle b/settings.gradle index 66c360c1328..eee743b4198 100644 --- a/settings.gradle +++ b/settings.gradle @@ -67,6 +67,9 @@ dependencyResolutionManagement { includeModule("com.github.PhilJay", "MPAndroidChart") } } + maven { + url "https://maven.singular.net" + } } } From a0cce294e71d8bef45eb5fe3029a5b29a8f4cab1 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Wed, 26 Feb 2025 18:01:12 +0200 Subject: [PATCH 15/15] Deps: Add singular dependency (woocommerce-wear) --- WooCommerce-Wear/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle index fcf740f6267..2c7e1ac7b85 100644 --- a/WooCommerce-Wear/build.gradle +++ b/WooCommerce-Wear/build.gradle @@ -207,6 +207,7 @@ dependencies { exclude group: 'com.squareup.okhttp3' } lintChecks(libs.android.security.lint) + implementation(libs.singular) } android.buildTypes.all { buildType ->