From 9fde8205f85f3144720aa4a7245e1756abbe9858 Mon Sep 17 00:00:00 2001 From: Ketan Reddy Date: Thu, 5 Mar 2026 10:26:51 -0800 Subject: [PATCH 1/3] consolidate test/coverage for non-ios targets --- .circleci/config.yml | 131 +++++++++---------------------------------- 1 file changed, 25 insertions(+), 106 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8556e5263..69f6b8146 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ parameters: orbs: macos: circleci/macos@2.5.4 - android: circleci/android@3.1.0 + android: circleci/android@3.2.0 codecov: codecov/codecov@5.4.3 executors: @@ -66,14 +66,6 @@ commands: steps: - attach_workspace: at: ~/player - - restore_cache: - keys: - - v1-bazel-cache-core-{{ .Branch }}-{{ .Revision }} - - v1-bazel-cache-core-{{ .Branch }} - - v1-bazel-cache-core-main - - gem-v1-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }} - - gem-v1-{{ arch }}-main-{{ checksum "Gemfile.lock" }} - - setup_auth - run: echo "//registry.npmjs.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc - run: | @@ -93,10 +85,6 @@ jobs: - checkout: method: full - - restore_cache: - keys: - - v1-dependencies-{{ checksum "package.json" }} - - persist_to_workspace: root: . paths: @@ -116,6 +104,7 @@ jobs: root: . paths: - . + bazelrc_fork: executor: minimal steps: @@ -144,17 +133,12 @@ jobs: - run: bazel build --config=ci -- $(bazel query 'filter("native_bundle$", //...)') - - save_cache: - paths: - - node_modules - key: v1-dependencies-{{ checksum "package.json" }} - - persist_to_workspace: root: . paths: - . - build_ios: + build_and_test_ios: executor: ios steps: - attach_workspace: @@ -220,10 +204,8 @@ jobs: mkdir -p _ios_coverage/lcov cp -r $(bazel info output_path)/_coverage/_coverage_report.dat _ios_coverage/lcov/ - - persist_to_workspace: - root: . - paths: - - _ios_coverage + - codecov/upload: + files: _ios_coverage/lcov/_coverage_report.dat - store_test_results: path: _test_results @@ -238,6 +220,8 @@ jobs: - run: bazel test --config=ci -- $(bazel query 'kind(".*_test", //...) except filter("ios|swiftui", //...)') -//android/demo:android_instrumentation_test + - run: bazel coverage --config=ci -- $(bazel query 'kind(".*_test", //...) except filter("ios|swiftui", //...)') -//android/demo:android_instrumentation_test + - run: when: always command: | @@ -248,6 +232,9 @@ jobs: cp $line $RESULTS_DIR/$(dirname $line) done + - codecov/upload: + files: ./bazel-out/_coverage/_coverage_report.dat, + - store_test_results: path: _test_results @@ -287,50 +274,12 @@ jobs: - store_artifacts: path: screenshots - coverage: - executor: base - steps: - - attach_workspace: - at: ~/player - - - restore_cache: - keys: - - v1-bazel-cache-core-{{ .Branch }}-{{ .Revision }} - - v1-bazel-cache-core-{{ .Branch }} - - v1-bazel-cache-core-main - - - run: | - BUNDLE_TARGETS=$(bazel query "kind(.*_test, //...) except filter('android|ios|swiftui', //...)" --output label 2>/dev/null | tr '\n' ' ') - bazel coverage --combined_report=lcov --config=ci -- $BUNDLE_TARGETS - - - run: - when: always - command: | - RESULTS_DIR=_test_results - find -L ./bazel-testlogs -name test.xml | while read line - do - mkdir -p $RESULTS_DIR/$(dirname $line) - cp $line $RESULTS_DIR/$(dirname $line) - done - - - store_test_results: - path: _test_results - - - codecov/upload: - files: ./bazel-out/_coverage/_coverage_report.dat,./_ios_coverage/lcov/_coverage_report.dat - bundle_analyze: executor: base steps: - attach_workspace: at: ~/player - - restore_cache: - keys: - - v1-bazel-cache-core-{{ .Branch }}-{{ .Revision }} - - v1-bazel-cache-core-{{ .Branch }} - - v1-bazel-cache-core-main - - run: ./scripts/bundle-analyze.sh maybe_release: @@ -349,11 +298,6 @@ jobs: steps: - attach_workspace: at: ~/player - - restore_cache: - keys: - - v1-bazel-cache-core-{{ .Branch }}-{{ .Revision }} - - v1-bazel-cache-core-{{ .Branch }} - - v1-bazel-cache-core-main - setup_auth - run: name: Check if docs should run @@ -390,11 +334,6 @@ jobs: steps: - attach_workspace: at: ~/player - - restore_cache: - keys: - - v1-bazel-cache-core-{{ .Branch }}-{{ .Revision }} - - v1-bazel-cache-core-{{ .Branch }} - - v1-bazel-cache-core-main - run: name: Build docs command: | @@ -466,7 +405,7 @@ workflows: - setup - bazelrc_fork - - build_ios: + - build_and_test_ios: name: build-ios-trunk filters: branches: @@ -476,7 +415,7 @@ workflows: - bazelrc - build-trunk - - build_ios: + - build_and_test_ios: name: build-ios-fork filters: branches: @@ -538,26 +477,6 @@ workflows: requires: - build-fork - - coverage: - name: coverage-trunk - filters: - branches: - ignore: - - /pull\/.*/ - requires: - - build-trunk - - build-ios-trunk - - - coverage: - name: coverage-fork - filters: - branches: - only: - - /pull\/.*/ - requires: - - build-fork - - build-ios-fork - - bundle_analyze: name: bundle-analyze-trunk filters: @@ -636,7 +555,7 @@ workflows: requires: - bazelrc - - build_ios: + - build_and_test_ios: requires: - build @@ -646,30 +565,30 @@ workflows: requires: - build - - coverage: + - test: requires: - build - - build_ios + - build_and_test_ios - bundle_analyze: name: bundle-analyze requires: - - coverage + - test - build_docs: context: - Publish requires: - - coverage + - test - release: context: - Publish requires: - android_test - - coverage + - test - bundle-analyze - - build_ios + - build_and_test_ios - build_docs full_release: @@ -688,7 +607,7 @@ workflows: requires: - setup - - build_ios: + - build_and_test_ios: requires: - bazelrc @@ -698,27 +617,27 @@ workflows: requires: - build - - coverage: + - test: requires: - build - bundle_analyze: name: bundle-analyze requires: - - coverage + - test - build_docs: context: - Publish requires: - - coverage + - test - release: context: - Publish requires: - android_test - - coverage + - test - bundle_analyze - - build_ios + - build_and_test_ios - build_docs From 2d9afca02dc5834e5cb60991984889b9da5bc706 Mon Sep 17 00:00:00 2001 From: Ketan Reddy Date: Thu, 5 Mar 2026 10:52:57 -0800 Subject: [PATCH 2/3] Fix coverage file path for js/jvm job --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69f6b8146..d15757616 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -233,7 +233,7 @@ jobs: done - codecov/upload: - files: ./bazel-out/_coverage/_coverage_report.dat, + files: ./bazel-out/_coverage/_coverage_report.dat - store_test_results: path: _test_results From 62be8b188aaed7e503736999a6ccb3b48527a2ae Mon Sep 17 00:00:00 2001 From: Ketan Reddy Date: Thu, 5 Mar 2026 13:20:42 -0800 Subject: [PATCH 3/3] Try and fix iOS coverage upload --- .circleci/config.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d15757616..c1ebb21a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,6 @@ jobs: --config=ci-mac \ --jobs=1 \ --experimental_use_llvm_covmap \ - --combined_report=lcov \ --test_output=all \ --test_timeout=1800 \ $(bazel query "kind(ios_unit_test, //ios/...)") \ @@ -198,14 +197,9 @@ jobs: mkdir -p $RESULTS_DIR/$(dirname $line) cp $line $RESULTS_DIR/$(dirname $line) done - - run: - when: always - command: | - mkdir -p _ios_coverage/lcov - cp -r $(bazel info output_path)/_coverage/_coverage_report.dat _ios_coverage/lcov/ - codecov/upload: - files: _ios_coverage/lcov/_coverage_report.dat + files: ./bazel-out/_coverage/_coverage_report.dat - store_test_results: path: _test_results