Skip to content

Commit

Permalink
Remove duplicated jobs in CircleCI (#41698)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: #41698

With the previous changes on the Pod configuration, the build setup for the New and Old architecture are the same.
The only observable difference happens at runtime.

This change:
1. Removes the build job that are split by architecture (which is now duplicated work)
2. Add two more test jobs to run runtime tests (unit and integration test) to make sure that the two architectures continue working.

## Changelog:
[Internal] - [CI] Remove duplicated build jobs, add tests jobs

Reviewed By: cortinico

Differential Revision: D51659275

fbshipit-source-id: 769c9ee004e7f4f1a7444f39c02b7083e007b780
  • Loading branch information
cipolleschi authored and facebook-github-bot committed Nov 29, 2023
1 parent 4a35f25 commit dc95568
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 22 deletions.
18 changes: 7 additions & 11 deletions .circleci/configurations/test_workflows/testAll.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,17 @@
flavor: "Debug"
executor: reactnativeios-lts
- test_ios_template:
architecture: "OldArch"
requires:
- build_npm_package
matrix:
parameters:
architecture: ["NewArch", "OldArch"]
flavor: ["Debug", "Release"]
jsengine: ["Hermes", "JSC"]
use_frameworks: ["StaticLibraries", "DynamicFrameworks"]
exclude:
# This config is tested with Ruby 3.2.0. Let's not double test it.
- architecture: "NewArch"
flavor: "Debug"
- flavor: "Debug"
jsengine: "Hermes"
use_frameworks: "StaticLibraries"
- test_ios_rntester:
Expand All @@ -84,33 +83,30 @@
architecture: "NewArch"
executor: reactnativeios-lts
- test_ios_rntester:
architecture: "NewArch"
requires:
- build_hermes_macos
matrix:
parameters:
architecture: ["NewArch", "OldArch"]
jsengine: ["Hermes", "JSC"]
use_frameworks: ["StaticLibraries", "DynamicFrameworks"]
exclude:
# Tested by test_ios-Hermes
- architecture: "OldArch"
jsengine: "Hermes"
- jsengine: "Hermes"
use_frameworks: "StaticLibraries"
# Tested by test_ios-JSC
- architecture: "OldArch"
jsengine: "JSC"
- jsengine: "JSC"
use_frameworks: "StaticLibraries"
# Tested with Ruby 3.2.0, do not test this twice.
- architecture: "NewArch"
jsengine: "Hermes"
- jsengine: "Hermes"
use_frameworks: "StaticLibraries"
- test_ios_rntester:
run_unit_tests: true
architecture: "OldArch"
use_frameworks: "StaticLibraries"
ruby_version: "2.6.10"
requires:
- build_hermes_macos
matrix:
parameters:
architecture: ["OldArch", "NewArch"]
jsengine: ["Hermes", "JSC"]
18 changes: 7 additions & 11 deletions .circleci/configurations/test_workflows/testIOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,17 @@
flavor: "Debug"
executor: reactnativeios-lts
- test_ios_template:
architecture: "OldArch"
requires:
- build_npm_package
matrix:
parameters:
architecture: ["NewArch", "OldArch"]
flavor: ["Debug", "Release"]
jsengine: ["Hermes", "JSC"]
use_frameworks: ["StaticLibraries", "DynamicFrameworks"]
exclude:
# Tested with Ruby 3.2.0, let's not double test this
- architecture: "NewArch"
flavor: "Debug"
- flavor: "Debug"
jsengine: "Hermes"
use_frameworks: "StaticLibraries"
- test_ios_rntester:
Expand All @@ -75,33 +74,30 @@
architecture: "NewArch"
executor: reactnativeios-lts
- test_ios_rntester:
architecture: "NewArch"
requires:
- build_hermes_macos
matrix:
parameters:
architecture: ["NewArch", "OldArch"]
jsengine: ["Hermes", "JSC"]
use_frameworks: ["StaticLibraries", "DynamicFrameworks"]
exclude:
# Tested by test_ios-Hermes
- architecture: "OldArch"
jsengine: "Hermes"
- jsengine: "Hermes"
use_frameworks: "StaticLibraries"
# Tested by test_ios-JSC
- architecture: "OldArch"
jsengine: "JSC"
- jsengine: "JSC"
use_frameworks: "StaticLibraries"
# Tested with Ruby 3.2.0, let's not double test this
- architecture: "NewArch"
jsengine: "Hermes"
- jsengine: "Hermes"
use_frameworks: "StaticLibraries"
- test_ios_rntester:
run_unit_tests: true
architecture: "OldArch"
use_frameworks: "StaticLibraries"
ruby_version: "2.6.10"
requires:
- build_hermes_macos
matrix:
parameters:
architecture: ["NewArch", "OldArch"]
jsengine: ["Hermes", "JSC"]

0 comments on commit dc95568

Please sign in to comment.