From 320dc4e6b85f18fbb2bdf7d13e724def5c6db76a Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Tue, 17 Oct 2023 02:33:19 -0700 Subject: [PATCH] RN][CI] Remove Flipper integration from iOS CI (#41003) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/41003 Following up the deprecation of Flipper in 0.73 and preparing for the removal of Flipper in 0.74, we are removing Flipper integration from the CI. ## Changelog: [Internal] - Remove the Flipper integration from CI Reviewed By: dmytrorykun Differential Revision: D50321335 fbshipit-source-id: 04885d3dbaab9b2834c9461e0580dfbef386244f --- .circleci/configurations/jobs.yml | 12 +-- .../configurations/test_workflows/testAll.yml | 77 ++----------------- .../configurations/test_workflows/testIOS.yml | 77 ++----------------- 3 files changed, 11 insertions(+), 155 deletions(-) diff --git a/.circleci/configurations/jobs.yml b/.circleci/configurations/jobs.yml index 92cc1eaf6ae..966cf787cef 100644 --- a/.circleci/configurations/jobs.yml +++ b/.circleci/configurations/jobs.yml @@ -403,11 +403,6 @@ jobs: description: Which JavaScript engine to use. Must be one of "Hermes", "JSC". type: enum enum: ["Hermes", "JSC"] - flipper: - default: "WithFlipper" - description: Whether Flipper is enabled. Must be one of "WithFlipper", "WithoutFlipper". - type: enum - enum: ["WithFlipper", "WithoutFlipper"] use_frameworks: default: "StaticLibraries" description: Which kind of option we want to use for `use_frameworks!` @@ -465,7 +460,7 @@ jobs: podfile_lock_cache_key: << parameters.podfile_lock_cache_key >> steps: - run: - name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >> + name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>> command: | cd /tmp/$PROJECT_NAME/ios @@ -477,10 +472,6 @@ jobs: export USE_HERMES=0 fi - if [[ << parameters.flipper >> == "WithoutFlipper" ]]; then - export NO_FLIPPER=1 - fi - if [[ << parameters.use_frameworks >> == "DynamicFrameworks" ]]; then export USE_FRAMEWORKS=dynamic fi @@ -561,7 +552,6 @@ jobs: fi if [[ << parameters.use_frameworks >> == "DynamicFrameworks" ]]; then - export NO_FLIPPER=1 export USE_FRAMEWORKS=dynamic fi diff --git a/.circleci/configurations/test_workflows/testAll.yml b/.circleci/configurations/test_workflows/testAll.yml index ad95c094443..9d278de720c 100644 --- a/.circleci/configurations/test_workflows/testAll.yml +++ b/.circleci/configurations/test_workflows/testAll.yml @@ -69,83 +69,12 @@ architecture: ["NewArch", "OldArch"] flavor: ["Debug", "Release"] jsengine: ["Hermes", "JSC"] - flipper: ["WithFlipper", "WithoutFlipper"] use_frameworks: ["StaticLibraries", "DynamicFrameworks"] exclude: - - architecture: "NewArch" - flavor: "Release" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "NewArch" - flavor: "Release" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "NewArch" - flavor: "Release" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "NewArch" - flavor: "Release" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "OldArch" - flavor: "Release" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "OldArch" - flavor: "Release" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "OldArch" - flavor: "Release" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "OldArch" - flavor: "Release" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" + # This config is tested with Ruby 3.2.0. Let's not double test it. - architecture: "NewArch" flavor: "Debug" jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "NewArch" - flavor: "Debug" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "OldArch" - flavor: "Debug" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "OldArch" - flavor: "Debug" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "NewArch" - flavor: "Debug" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "NewArch" - flavor: "Debug" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "OldArch" - flavor: "Debug" - jsengine: "JSC" - flipper: "WithFlipper" use_frameworks: "StaticLibraries" - test_ios_rntester: requires: @@ -170,6 +99,10 @@ - architecture: "OldArch" jsengine: "JSC" use_frameworks: "StaticLibraries" + # Tested with Ruby 3.2.0, do not test this twice. + - architecture: "NewArch" + jsengine: "Hermes" + use_frameworks: "StaticLibraries" - test_ios_rntester: run_unit_tests: true architecture: "OldArch" diff --git a/.circleci/configurations/test_workflows/testIOS.yml b/.circleci/configurations/test_workflows/testIOS.yml index 487358cef7a..7e102d3a0ae 100644 --- a/.circleci/configurations/test_workflows/testIOS.yml +++ b/.circleci/configurations/test_workflows/testIOS.yml @@ -60,83 +60,12 @@ architecture: ["NewArch", "OldArch"] flavor: ["Debug", "Release"] jsengine: ["Hermes", "JSC"] - flipper: ["WithFlipper", "WithoutFlipper"] use_frameworks: ["StaticLibraries", "DynamicFrameworks"] exclude: - - architecture: "NewArch" - flavor: "Release" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "NewArch" - flavor: "Release" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "NewArch" - flavor: "Release" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "NewArch" - flavor: "Release" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "OldArch" - flavor: "Release" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "OldArch" - flavor: "Release" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "OldArch" - flavor: "Release" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "OldArch" - flavor: "Release" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" + # Tested with Ruby 3.2.0, let's not double test this - architecture: "NewArch" flavor: "Debug" jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "NewArch" - flavor: "Debug" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "OldArch" - flavor: "Debug" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "OldArch" - flavor: "Debug" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "DynamicFrameworks" - - architecture: "NewArch" - flavor: "Debug" - jsengine: "Hermes" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "NewArch" - flavor: "Debug" - jsengine: "JSC" - flipper: "WithFlipper" - use_frameworks: "StaticLibraries" - - architecture: "OldArch" - flavor: "Debug" - jsengine: "JSC" - flipper: "WithFlipper" use_frameworks: "StaticLibraries" - test_ios_rntester: requires: @@ -161,6 +90,10 @@ - architecture: "OldArch" jsengine: "JSC" use_frameworks: "StaticLibraries" + # Tested with Ruby 3.2.0, let's not double test this + - architecture: "NewArch" + jsengine: "Hermes" + use_frameworks: "StaticLibraries" - test_ios_rntester: run_unit_tests: true architecture: "OldArch"