Merge branch 'trunk' into nick/language-test

wordpress-mobile · Dec 6, 2024 · d3acad3 · d3acad3
2 parents b4c8e1f + 35a298d
commit d3acad3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -127,27 +127,27 @@ steps:
   #################
   # Instrumented (aka UI) Tests
   #################
-  - group: "🔬 Instrumented tests"
-    steps:
-      - label: ":wordpress: 🔬 Instrumented tests"
-        command: ".buildkite/commands/run-instrumented-tests.sh wordpress"
-        plugins:
-          - $CI_TOOLKIT
-          - $TEST_COLLECTOR :
-              <<: *test_collector_common_params
-              api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS_WORDPRESS"
-        artifact_paths:
-          - "**/build/instrumented-tests/**/*"
-
-      - label: ":jetpack: 🔬 Instrumented tests"
-        command: ".buildkite/commands/run-instrumented-tests.sh jetpack"
-        plugins:
-          - $CI_TOOLKIT
-          - $TEST_COLLECTOR :
-              <<: *test_collector_common_params
-              api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS_JETPACK"
-        artifact_paths:
-          - "**/build/instrumented-tests/**/*"
+  # - group: "🔬 Instrumented tests"
+  #   steps:
+  #     - label: ":wordpress: 🔬 Instrumented tests"
+  #       command: ".buildkite/commands/run-instrumented-tests.sh wordpress"
+  #       plugins:
+  #         - $CI_TOOLKIT
+  #         - $TEST_COLLECTOR :
+  #             <<: *test_collector_common_params
+  #             api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS_WORDPRESS"
+  #       artifact_paths:
+  #         - "**/build/instrumented-tests/**/*"
+
+  #     - label: ":jetpack: 🔬 Instrumented tests"
+  #       command: ".buildkite/commands/run-instrumented-tests.sh jetpack"
+  #       plugins:
+  #         - $CI_TOOLKIT
+  #         - $TEST_COLLECTOR :
+  #             <<: *test_collector_common_params
+  #             api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS_JETPACK"
+  #       artifact_paths:
+  #         - "**/build/instrumented-tests/**/*"
 
   #################
   # Create Prototype Builds for WP and JP

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -57,7 +57,7 @@ fladle = '0.17.5'
 google-autoservice = '1.1.1'
 google-dagger = '2.53'
 google-exoplayer = '2.13.3'
-google-firebase-bom = '33.6.0'
+google-firebase-bom = '33.7.0'
 google-firebase-iid = '21.1.0'
 google-flexboxlayout = '3.0.0'
 google-gson = '2.11.0'