diff --git a/.circleci/configurations/test_workflows/testAll.yml b/.circleci/configurations/test_workflows/testAll.yml index fe497a7922a973..7afd7d2171f57d 100644 --- a/.circleci/configurations/test_workflows/testAll.yml +++ b/.circleci/configurations/test_workflows/testAll.yml @@ -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: @@ -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"] diff --git a/.circleci/configurations/test_workflows/testIOS.yml b/.circleci/configurations/test_workflows/testIOS.yml index bff9e73786d795..eb6cf50a527aa3 100644 --- a/.circleci/configurations/test_workflows/testIOS.yml +++ b/.circleci/configurations/test_workflows/testIOS.yml @@ -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: @@ -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"]