From d6075b63ead7315b0b73a7577cd25dc07a626063 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Mon, 5 Sep 2022 15:14:49 +0100 Subject: [PATCH] feat: add matrix tests for Flipper/No Flipper --- .circleci/config.yml | 15 ++++++++++++++- template/ios/Podfile | 4 +++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ee8f1a63da1f5f..8eda8c67c1885b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -689,6 +689,9 @@ jobs: jsengine: type: string default: "Hermes" + flipper: + type: string + default: "WithFlipper" environment: - PROJECT_NAME: "iOSTemplateProject" - HERMES_WS_DIR: *hermes_workspace_root @@ -716,7 +719,7 @@ jobs: node ./scripts/set-rn-template-version.js "file:$PATH_TO_PACKAGE" node cli.js init $PROJECT_NAME --directory "/tmp/$PROJECT_NAME" --template $REPO_ROOT --verbose --skip-install - run: - name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>> + name: Install iOS dependencies - Configuration << parameters.flavor >>; New Architecture << parameters.architecture >>; JS Engine << parameters.jsengine>>; Flipper << parameters.flipper >> command: | cd /tmp/$PROJECT_NAME yarn install @@ -736,6 +739,10 @@ jobs: export USE_HERMES=0 fi + if [[ << parameters.flipper >> == "WithoutFlipper" ]]; then + export NO_FLIPPER=1 + fi + bundle exec pod install - run: name: Build template project @@ -1347,6 +1354,12 @@ workflows: architecture: ["NewArch", "OldArch"] flavor: ["Debug", "Release"] jsengine: ["Hermes", "JSC"] + flipper: ["WithFlipper", "WithoutFlipper"] + exlude: + - architecture: "NewArch" + flavor: "Release" + jsengine: "Hermes" + flipper: "WithFlipper" - test_ios_rntester: requires: - build_hermes_macos diff --git a/template/ios/Podfile b/template/ios/Podfile index d1953783520bd6..006397252e5c65 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -4,6 +4,8 @@ require_relative '../node_modules/react-native/scripts/native_modules' platform :ios, '12.4' install! 'cocoapods', :deterministic_uuids => false +flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled + target 'HelloWorld' do config = use_native_modules! @@ -21,7 +23,7 @@ target 'HelloWorld' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable the next line. - :flipper_configuration => FlipperConfiguration.enabled, + :flipper_configuration => flipper_config, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." )