Merge commit 'd7af27dd7da529eb3feda12c45eefe35f9a7f79f' into features…

…/fix_ellipsis_background

.circleci/config.yml

@@ -39,7 +39,16 @@ jobs:
           command: |
             apt update
             apt install -y wget git curl jq
-            curl -sL https://deb.nodesource.com/setup_18.x | bash -
+
+            apt-get update
+            apt-get install -y ca-certificates curl gnupg
+            mkdir -p /etc/apt/keyrings
+            curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+
+            NODE_MAJOR=18
+            echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+            apt-get update
+
             apt install -y nodejs
             npm install --global yarn
       - checkout

.circleci/configurations/commands.yml

@@ -46,9 +46,14 @@ commands:
               echo "rbenv found; Skipping installation"
             fi
 
-            brew reinstall libyaml
-            gem install psych -- --with-libyaml-dir=$(brew --prefix libyaml)
-            export RUBY_CONFIGURE_OPTS=--with-libyaml-dir=$(brew --prefix libyaml)
+            xcode=$(xcodebuild -version | cut -d' ' -f2 | head -n 1)
+            # For some reason, the Xcode 14.1 machnine is already properly configured.
+            if [[ $xcode != '14.1' ]]; then
+              brew reinstall libyaml
+              gem install psych -- --with-libyaml-dir=$(brew --prefix libyaml)
+              export RUBY_CONFIGURE_OPTS=--with-libyaml-dir=$(brew --prefix libyaml)
+            fi
+
 
             # Install the right version of ruby
             if [[ -z "$(rbenv versions | grep << parameters.ruby_version >>)" ]]; then
@@ -79,6 +84,18 @@ commands:
         type: string
 
     steps:
+      - run:
+          name: Move to Node 18 if Needed
+          command: |
+            node_version=$(node -v)
+            major_version=$(echo $node_version | cut -c 2- | cut -d '.' -f 1)
+
+            if [[ $major_version < 18 ]]; then
+              nvm install 18.18.0
+              nvm alias default 18.18.0
+            else
+              echo 'We have the right node version!'
+            fi
       - restore_cache:
           keys:
             - << parameters.yarn_base_cache_key >>-{{ arch }}-{{ checksum "yarn.lock" }}

.circleci/configurations/executors.yml

@@ -36,3 +36,10 @@ executors:
     resource_class: macos.x86.medium.gen2
     environment:
       - BUILD_FROM_SOURCE: true
+  reactnativeios-lts:
+    <<: *defaults
+    macos:
+      xcode: '14.1.0'
+    resource_class: macos.x86.medium.gen2
+    environment:
+      - BUILD_FROM_SOURCE: true

.circleci/configurations/jobs.yml

@@ -386,7 +386,6 @@ jobs:
   #    JOBS: Test iOS Template
   # -------------------------
   test_ios_template:
-    executor: reactnativeios
     parameters:
       flavor:
         default: "Debug"
@@ -403,11 +402,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!`
@@ -429,6 +423,11 @@ jobs:
       cocoapods_cache_key:
         type: string
         default: *template_cocoapods_cache_key
+      executor:
+        description: The executor to use
+        default: reactnativeios
+        type: string
+    executor: << parameters.executor >>
     environment:
       - PROJECT_NAME: "iOSTemplateProject"
       - HERMES_WS_DIR: *hermes_workspace_root
@@ -465,7 +464,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 +476,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
@@ -501,7 +496,7 @@ jobs:
   #    JOBS: Test iOS RNTester
   # -------------------------
   test_ios_rntester:
-    executor: reactnativeios
+
     parameters:
       jsengine:
         default: "Hermes"
@@ -526,6 +521,11 @@ jobs:
         description: whether unit tests should run or not.
         default: false
         type: boolean
+      executor:
+        description: The executor to use
+        default: reactnativeios
+        type: string
+    executor: << parameters.executor >>
     steps:
       - checkout_code_with_cache
       - run_yarn
@@ -561,7 +561,6 @@ jobs:
                         fi
 
                         if [[ << parameters.use_frameworks >> == "DynamicFrameworks" ]]; then
-                          export NO_FLIPPER=1
                           export USE_FRAMEWORKS=dynamic
                         fi
 
@@ -620,7 +619,7 @@ jobs:
       - run:
           name: Install Node JS
           # Note: Version set separately for non-Windows builds, see above.
-          command: choco install nodejs-lts
+          command: choco install nodejs --version=18.18.0 --allow-downgrade
 
       # Setup Dependencies
       - run:
@@ -680,7 +679,16 @@ jobs:
             apt update
 
             apt install -y wget git curl jq
-            curl -sL https://deb.nodesource.com/setup_18.x | bash -
+
+            apt-get update
+            apt-get install -y ca-certificates curl gnupg
+            mkdir -p /etc/apt/keyrings
+            curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+
+            NODE_MAJOR=18
+            echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+            apt-get update
+
             apt install -y nodejs
             npm install --global yarn
       - checkout
@@ -887,6 +895,22 @@ jobs:
 
             echo "Moving from build_$SLICE to $FINAL_PATH"
             mv build_"$SLICE" "$FINAL_PATH"
+
+            # check whether everything is there
+            if [[ -d "$FINAL_PATH/API/hermes/hermes.framework" ]]; then
+              echo "Successfully built hermes.framework for $SLICE in $FLAVOR"
+            else
+              echo "Failed to built hermes.framework for $SLICE in $FLAVOR"
+              exit 1
+            fi
+
+            if [[ -d "$FINAL_PATH/API/hermes/hermes.framework.dSYM" ]]; then
+              echo "Successfully built hermes.framework.dSYM for $SLICE in $FLAVOR"
+            else
+              echo "Failed to built hermes.framework.dSYM for $SLICE in $FLAVOR"
+              echo "Please try again"
+              exit 1
+            fi
       - save_cache:
           key: << parameters.slice_base_cache_key >>-<< parameters.slice >>-<< parameters.flavor >>
           paths:

.circleci/configurations/test_workflows/testAll.yml

@@ -61,6 +61,7 @@
           ruby_version: "3.2.0"
           architecture: "NewArch"
           flavor: "Debug"
+          executor: reactnativeios-lts
       - test_ios_template:
           requires:
             - build_npm_package
@@ -69,90 +70,20 @@
               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:
             - build_hermes_macos
           name: "Test RNTester with Ruby 3.2.0"
           ruby_version: "3.2.0"
           architecture: "NewArch"
+          executor: reactnativeios-lts
       - test_ios_rntester:
           requires:
             - build_hermes_macos
@@ -170,6 +101,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"

.circleci/configurations/test_workflows/testAndroid.yml

@@ -46,7 +46,7 @@
       - test_android:
           requires:
             - build_android
-      - test_e2e_android
+      # - test_e2e_android
       - test_android_template:
           requires:
             - build_npm_package

.circleci/configurations/test_workflows/testE2E.yml

@@ -7,5 +7,4 @@
     jobs:
       - test_e2e_ios:
           ruby_version: "2.7.7"
-      # This is not stable
-      # - test_e2e_android
+      - test_e2e_android