chore: codepush ci refactor, check native code command (#9338)

* add command to check native code

* try making codepush deploy part of test-build-deploy flow

* refactor job to not install deps unless necessary

* remove now unused script

* try m1 for this

* try installing ruby

* chore: use m1 machines in ci (#9262)

* use m1 machines in ci

* is it because ruby version does not match?

* how was this working before

* missed a spot

* try using 2.7.8 to workaround ruby install issue

* turn off early quit for now

* try installing rosetta

* Revert "turn off early quit for now"

This reverts commit 5f12fb4.

* remove unnecessary ruby install

* make sure jq is installed

* avoid re-executed the deployment check script

* try to specify ruby version, fail hard in scripts

* try using xcode 14.3.1

* add verbose output

* maybe it is this?

* i dk man

* which one of you broke everything

* was it you relay?

* was it you codepush cli?

* i think it was you jq

* remove dev changes

* missed podfile change

* increment native code version

* try updating the simulator used

* update failing snapshot image

.circleci/config.yml

@@ -4,7 +4,6 @@ orbs:
   node: circleci/[email protected]
   queue: eddiewebb/[email protected]
   horizon: artsy/[email protected]
-  jq: circleci/[email protected]
   macos: circleci/[email protected]
 
 commands:
@@ -183,7 +182,7 @@ jobs:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
 
     macos:
-      xcode: 14.1.0
+      xcode: 14.3.1
       resource_class: macos.m1.medium.gen1
 
     steps:
@@ -195,21 +194,42 @@ jobs:
 
   check-and-deploy:
     environment:
-      BUNDLE_PATH: .vendor # path to install gems and use for caching
+      BUNDLE_PATH: .vendor
 
     macos:
-      xcode: 14.1.0
-      resource_class: macos.x86.medium.gen2
+      xcode: 14.3.1
+      resource_class: macos.m1.medium.gen1
 
     steps:
       - checkout
       - install-node
+      - install-gems
       - run:
-          name: Check if native code has changed
-          command: ./scripts/codepush/check-native-code.sh
+          name: Install jq
+          command: brew install jq
       - run:
-          name: Deploy or notify
-          command: ./scripts/codepush/deploy-or-notify.sh
+          name: Determine Deployment Type
+          command: |
+            DEPLOYMENT_TYPE=$(./scripts/codepush/determine-deployment-type.sh)
+            echo "export DEPLOYMENT_TYPE=$DEPLOYMENT_TYPE" >> $BASH_ENV
+      - run:
+          name: Handle Deployment for beta
+          command: |
+            if [ "$DEPLOYMENT_TYPE" == "beta" ]; then
+              echo "Native code changed, notifying new beta needed!"
+              bundle exec fastlane notify_beta_needed
+              circleci-agent step halt
+            fi
+      - install-node-modules
+      - run:
+          name: Install CodePush CLI
+          command: yarn global add appcenter-cli
+      - run-relay-compiler
+      - run:
+          name: Handle Deployment for codepush
+          command: |
+            echo "Triggering CodePush deployment..."
+            ./scripts/codepush/deploy-to-codepush.sh Staging
 
   test-js:
     parallelism: 8
@@ -289,7 +309,7 @@ jobs:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
 
     macos:
-      xcode: 14.1.0
+      xcode: 14.3.1
       resource_class: macos.m1.medium.gen1
 
     steps:
@@ -339,7 +359,7 @@ jobs:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
 
     macos:
-      xcode: 14.1.0
+      xcode: 14.3.1
       resource_class: macos.m1.medium.gen1
 
     steps:
@@ -433,7 +453,7 @@ jobs:
     environment:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
     macos:
-      xcode: 14.1.0
+      xcode: 14.3.1
       resource_class: macos.m1.medium.gen1
     steps:
       - checkout
@@ -455,14 +475,6 @@ workflows:
     jobs:
       - deploy-nightly-beta
 
-  deploy:
-    jobs:
-      - check-and-deploy:
-          filters:
-            branches:
-              only:
-                - main
-
   flag-check:
     triggers:
       - schedule:
@@ -520,6 +532,12 @@ workflows:
                 - app_store_submission
                 - play_store_submission
 
+      - check-and-deploy:
+          filters:
+            branches:
+              only:
+                - main
+
       - test-js:
           filters:
             branches:

ios/ArtsyTests/Supporting_Files/ARTestHelper.m

@@ -16,8 +16,8 @@ - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:
 {
     NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion;
 
-    NSAssert(version.majorVersion == 16 && version.minorVersion == 1,
-             @"The tests should be run on iOS 16.1, not %ld.%ld", version.majorVersion, version.minorVersion);
+    NSAssert(version.majorVersion == 16 && version.minorVersion == 4,
+             @"The tests should be run on iOS 16.4, not %ld.%ld", version.majorVersion, version.minorVersion);
 
     CGSize nativeResolution = [UIScreen mainScreen].nativeBounds.size;
     NSAssert([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone && CGSizeEqualToSize(nativeResolution, CGSizeMake(1179, 2556)),

package.json

@@ -30,6 +30,7 @@
     "clean-android": "cd android; ./gradlew clean; cd -",
     "clean-ios": "yarn rimraf ~/Library/Developer/Xcode/DerivedData",
     "codepush:deploy": "./scripts/codepush/deploy-to-codepush.sh",
+    "codepush:check-native-code": "./scripts/codepush/check-native-code.sh",
     "codepush:increment-native-code": "./scripts/codepush/increment-native-code.sh",
     "danger": "danger",
     "dead-code": "./scripts/check-dead-code.sh",

scripts/codepush/calculate-native-hash.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euxo pipefail
 
 # Directory paths to be checked for changes
 declare -a android_paths_to_check=("./android/app/src")

scripts/codepush/check-native-code.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euxo pipefail
 
 # Get the directory of the currently executing script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

scripts/codepush/determine-deployment-type.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euxo pipefail
 
 # Get the native code version before the merge (from the main branch)
 pre_merge_native_code_version=$(git show main:app.json | jq -r '.nativeCodeVersion | to_entries | reduce .[] as $item (0; . as $key | if $item.key | tonumber > $key then $item.key | tonumber else $key end)')

scripts/codepush/increment-native-code.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euxo pipefail
 
 # Get the directory of the currently executing script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

scripts/source-for-bash-env

@@ -10,7 +10,7 @@ export LOCAL_BRANCH
 export WORKSPACE="ios/Artsy.xcworkspace"
 export SCHEME="Artsy"
 export DEVICE_HOST_PLAT="iOS Simulator"
-export DEVICE_HOST_OS="16.1"
+export DEVICE_HOST_OS="16.4"
 export DEVICE_HOST_NAME="iPhone 14 Pro"
 export DERIVED_DATA_PATH="derived_data"
 export CONFIGURATION="Release"