Merge pull request #124 from blacksky-algorithms/fix/ci-ota-nightly

Author: rishibalakrishnan

.github/workflows/build-submit-ios.yml

@@ -168,21 +168,28 @@ jobs:
             echo ""
             echo "Build dir contents:"
             ls -la "$BUILD_DIR"
+            # Export the discovered paths rather than hardcoding a product name.
+            # The Xcode scheme is "Blacksky" in this fork, so the artifacts are
+            # Blacksky.ipa / Blacksky.app.dSYM.zip — downstream steps must use the
+            # paths we actually found, not a fixed "Bluesky.ipa".
+            DSYM_PATH="$(find ios-build -type f -name '*.app.dSYM.zip' -print -quit)"
             echo "BUILD_DIR=$BUILD_DIR" >> $GITHUB_ENV
+            echo "IPA_PATH=$IPA_PATH" >> $GITHUB_ENV
+            echo "DSYM_PATH=$DSYM_PATH" >> $GITHUB_ENV
           else
             echo "Archive file not found!"
             exit 1
           fi
 
       - name: 🚀 Deploy
-        run: pnpm eas submit -p ios --non-interactive --path "$BUILD_DIR/Bluesky.ipa"
+        run: pnpm eas submit -p ios --non-interactive --path "$IPA_PATH"
 
       - name: 🪲 Upload dSYM to Sentry
         run: >
           SENTRY_ORG=blacksky-algorithms
           SENTRY_PROJECT=social-app
           SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          pnpm sentry-cli debug-files upload "$BUILD_DIR/Bluesky.app.dSYM.zip" --include-sources
+          pnpm sentry-cli debug-files upload "$DSYM_PATH" --include-sources
 
       - name: 📚 Get version from package.json
         id: get-build-info
@@ -197,7 +204,7 @@ jobs:
         id: ipa-build-number
         run: |
           plist_dir="$(mktemp -d)"
-          unzip -o -q "$BUILD_DIR/Bluesky.ipa" 'Payload/*.app/Info.plist' -d "$plist_dir"
+          unzip -o -q "$IPA_PATH" 'Payload/*.app/Info.plist' -d "$plist_dir"
           plist="$(find "$plist_dir" -name Info.plist -print -quit)"
           build_number="$(/usr/libexec/PlistBuddy -c 'Print CFBundleVersion' "$plist")"
           rm -rf "$plist_dir"

.github/workflows/bundle-deploy-eas-update.yml

@@ -276,21 +276,28 @@ jobs:
             echo ""
             echo "Build dir contents:"
             ls -la "$BUILD_DIR"
+            # Export the discovered paths rather than hardcoding a product name.
+            # The Xcode scheme is "Blacksky" in this fork, so the artifacts are
+            # Blacksky.ipa / Blacksky.app.dSYM.zip — downstream steps must use the
+            # paths we actually found, not a fixed "Bluesky.ipa".
+            DSYM_PATH="$(find ios-build -type f -name '*.app.dSYM.zip' -print -quit)"
             echo "BUILD_DIR=$BUILD_DIR" >> $GITHUB_ENV
+            echo "IPA_PATH=$IPA_PATH" >> $GITHUB_ENV
+            echo "DSYM_PATH=$DSYM_PATH" >> $GITHUB_ENV
           else
             echo "Archive file not found!"
             exit 1
           fi
 
       - name: 🚀 Deploy
-        run: pnpm eas submit -p ios --non-interactive --path "$BUILD_DIR/Bluesky.ipa"
+        run: pnpm eas submit -p ios --non-interactive --path "$IPA_PATH"
 
       - name: 🪲 Upload dSYM to Sentry
         run: >
           SENTRY_ORG=blacksky-algorithms
           SENTRY_PROJECT=social-app
           SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-          pnpm sentry-cli debug-files upload "$BUILD_DIR/Bluesky.app.dSYM.zip" --include-sources
+          pnpm sentry-cli debug-files upload "$DSYM_PATH" --include-sources
 
       - name: ⬇️ Restore Cache
         id: get-base-commit

.github/workflows/nightly-update-source-languages.yaml

@@ -27,21 +27,14 @@ jobs:
           cache: pnpm
       - name: pnpm install
         run: pnpm install --frozen-lockfile
+      # We run extraction purely to catch strings that fail to compile/render, not
+      # to sync translations. Blacksky has no Crowdin subscription, so the previous
+      # "Push source lang to Crowdin" step always failed on an empty api_token. It
+      # has been removed; the extract + auto-commit of messages.po is the useful part.
       - name: Extract language strings
         run: pnpm intl:extract
       - name: Create commit
         uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
         with:
           commit_message: Nightly source-language update
           file_pattern: ./src/locale/locales/en/messages.po
-      - name: Push source lang to Crowdin
-        uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2.16.3
-        with:
-          upload_sources: true
-          upload_sources_args: "-b main"
-          upload_translations: false
-          push_translations: false
-          push_sources: false
-          create_pull_request: false
-        env:
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

app.config.js

@@ -21,6 +21,11 @@ module.exports = function (_config) {
   const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight'
   const IS_PRODUCTION = process.env.EXPO_PUBLIC_ENV === 'production'
   const IS_DEV = !IS_TESTFLIGHT && !IS_PRODUCTION
+  // True only when building on EAS (EAS sets EAS_BUILD=true / EAS_BUILD_PLATFORM).
+  // Used to scope OTA update code signing to EAS builds so local dev doesn't
+  // require the production update-signing private key.
+  const IS_EAS_BUILD =
+    process.env.EAS_BUILD === 'true' || !!process.env.EAS_BUILD_PLATFORM
 
   const ASSOCIATED_DOMAINS = [
     'applinks:blacksky.community',
@@ -224,11 +229,20 @@ module.exports = function (_config) {
         url: 'https://updates.blacksky.community/manifest',
         enabled: true,
         fallbackToCacheTimeout: 30000,
-        codeSigningCertificate: './code-signing/certificate.pem',
-        codeSigningMetadata: {
-          keyid: 'main',
-          alg: 'rsa-v1_5-sha256',
-        },
+        // OTA manifest code signing is only applied on EAS builds (which have the
+        // private key as a managed secret). Local dev builds omit it so developers
+        // don't need the production update-signing key just to serve a dev
+        // manifest from Metro (`expo start` otherwise errors: "Must specify
+        // --private-key-path ...").
+        ...(IS_EAS_BUILD
+          ? {
+              codeSigningCertificate: './code-signing/certificate.pem',
+              codeSigningMetadata: {
+                keyid: 'main',
+                alg: 'rsa-v1_5-sha256',
+              },
+            }
+          : {}),
         checkAutomatically: 'NEVER',
         // Enables Updates.setUpdateURLAndRequestHeadersOverride at runtime, which
         // is how non-production builds retarget to a pull-request-<n> channel for

patches/react-native@0.81.5.patch

@@ -1,3 +1,46 @@
+diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
+index 14f88de1f3ddadc39ca53c9e8944d7d2eeb60268..cee524b67823be6e4d10adb882a88e3bcb38efd4 100644
+--- a/React/Base/Surface/RCTSurface.mm
++++ b/React/Base/Surface/RCTSurface.mm
+@@ -465,7 +465,7 @@
+     // right after the semaphore signals.
+ 
+     // Atomic variant of `_waitingForMountingStageOnMainQueue = YES;`
+-    atomic_fetch_or(&_waitingForMountingStageOnMainQueue, 1);
++    atomic_exchange(&_waitingForMountingStageOnMainQueue, 1);
+   }
+ 
+   dispatch_semaphore_t semaphore;
+@@ -488,7 +488,7 @@
+   auto timeoutOccurred = dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, timeout * NSEC_PER_SEC));
+ 
+   // Atomic equivalent of `_waitingForMountingStageOnMainQueue = NO;`.
+-  atomic_fetch_and(&_waitingForMountingStageOnMainQueue, 0);
++  atomic_exchange(&_waitingForMountingStageOnMainQueue, 0);
+ 
+   if (!timeoutOccurred) {
+     // Balancing the semaphore.
+@@ -546,7 +546,7 @@
+ {
+   if (atomic_load(&_waitingForMountingStageOnMainQueue) && (self.stage & RCTSurfaceStageSurfaceDidInitialLayout)) {
+     // Atomic equivalent of `_waitingForMountingStageOnMainQueue = NO;`.
+-    atomic_fetch_and(&_waitingForMountingStageOnMainQueue, 0);
++    atomic_exchange(&_waitingForMountingStageOnMainQueue, 0);
+ 
+     {
+       std::lock_guard<std::mutex> lock(_mutex);
+diff --git a/React/DevSupport/RCTPackagerConnection.mm b/React/DevSupport/RCTPackagerConnection.mm
+index 39419d60e1203673e9cafb71c6932a6b9200bf18..b252a4976f7ad3b430d97c2bc94b781dd93dbd0a 100644
+--- a/React/DevSupport/RCTPackagerConnection.mm
++++ b/React/DevSupport/RCTPackagerConnection.mm
+@@ -9,6 +9,7 @@
+ 
+ #import <objc/runtime.h>
+ #import <algorithm>
++#import <mutex>
+ #import <vector>
+ 
+ #import <React/RCTAssert.h>
 diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
 index 914a2494a57923fbf185644b7e2bb8aca8848e56..0deac55f22350f5e8377d8963fb1c2434bf6abfd 100644
 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
@@ -15,7 +58,7 @@ diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewCompon
 index 1494fd225aff1fa0429e917404d6b4ca5fc961c5..df643f5c844ad2e684de5161528eba17f4a188d0 100644
 --- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
 +++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
-@@ -1038,6 +1038,11 @@ - (void)_adjustForMaintainVisibleContentPosition
+@@ -1038,6 +1038,11 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
    }
  }
 
@@ -27,6 +70,28 @@ index 1494fd225aff1fa0429e917404d6b4ca5fc961c5..df643f5c844ad2e684de5161528eba17
  @end
 
  Class<RCTComponentViewProtocol> RCTScrollViewCls(void)
+diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
+index 994e8ad6c107cb87274200849c204dee48e1f565..287b93403adb8554b2952f21bc56f1d02999636e 100644
+--- a/React/Profiler/RCTProfile.m
++++ b/React/Profiler/RCTProfile.m
+@@ -445,7 +445,7 @@ BOOL RCTProfileIsProfiling(void)
+ void RCTProfileInit(RCTBridge *bridge)
+ {
+   // TODO: enable assert JS thread from any file (and assert here)
+-  BOOL wasProfiling = atomic_fetch_or(&RCTProfileProfiling, 1);
++  BOOL wasProfiling = atomic_exchange(&RCTProfileProfiling, 1);
+   if (wasProfiling) {
+     return;
+   }
+@@ -492,7 +492,7 @@ void RCTProfileInit(RCTBridge *bridge)
+ void RCTProfileEnd(RCTBridge *bridge, void (^callback)(NSString *))
+ {
+   // assert JavaScript thread here again
+-  BOOL wasProfiling = atomic_fetch_and(&RCTProfileProfiling, 0);
++  BOOL wasProfiling = atomic_exchange(&RCTProfileProfiling, 0);
+   if (!wasProfiling) {
+     return;
+   }
 diff --git a/React/Views/RefreshControl/RCTRefreshControl.h b/React/Views/RefreshControl/RCTRefreshControl.h
 index e9b330fa7c29c42653a3b0191d0f8a1b13b2d3de..ec5f58c887bfd949f1279ef1c31352e0b465e9ec 100644
 --- a/React/Views/RefreshControl/RCTRefreshControl.h
@@ -44,15 +109,15 @@ diff --git a/React/Views/RefreshControl/RCTRefreshControl.m b/React/Views/Refres
 index 53bfd04703502d5b8e932c47a528bb03cd79d330..ff1b1ed5e060bcf0d91528c6d3c2c5c8acf24967 100644
 --- a/React/Views/RefreshControl/RCTRefreshControl.m
 +++ b/React/Views/RefreshControl/RCTRefreshControl.m
-@@ -23,6 +23,7 @@ @implementation RCTRefreshControl {
+@@ -23,6 +23,7 @@
    UIColor *_titleColor;
    CGFloat _progressViewOffset;
    BOOL _hasMovedToWindow;
 +  UIColor *_customTintColor;
  }
 
  - (instancetype)init
-@@ -58,6 +59,12 @@ - (void)layoutSubviews
+@@ -58,6 +59,12 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
    _isInitialRender = false;
  }
 
@@ -65,7 +130,7 @@ index 53bfd04703502d5b8e932c47a528bb03cd79d330..ff1b1ed5e060bcf0d91528c6d3c2c5c8
  - (void)didMoveToWindow
  {
    [super didMoveToWindow];
-@@ -221,4 +228,50 @@ - (void)refreshControlValueChanged
+@@ -221,4 +228,50 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
    }
  }
 
@@ -120,7 +185,7 @@ diff --git a/React/Views/RefreshControl/RCTRefreshControlManager.m b/React/Views
 index 40aaf9c51ebda9fedb1d1db2e9aacec84b4c39c8..1c60164b69762997b3369b46609a07768a06bad3 100644
 --- a/React/Views/RefreshControl/RCTRefreshControlManager.m
 +++ b/React/Views/RefreshControl/RCTRefreshControlManager.m
-@@ -22,11 +22,12 @@ - (UIView *)view
+@@ -22,11 +22,12 @@ RCT_EXPORT_MODULE()
 
  RCT_EXPORT_VIEW_PROPERTY(onRefresh, RCTDirectEventBlock)
  RCT_EXPORT_VIEW_PROPERTY(refreshing, BOOL)
@@ -150,6 +215,32 @@ index 8b6571698fc5dd091a0d8980a33bb40295faf305..27c97bfeb6f13907c89f1d85f2bb8b8a
        reactChoreographer.postFrameCallback(ReactChoreographer.CallbackType.IDLE_EVENT, this)
      }
    }
+diff --git a/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.cpp b/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.cpp
+index 66a91c91c6463e133342d33aa054e750bb32c047..021084bffe1b2e9f0ca4e7932dca2ea25904ffd7 100644
+--- a/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.cpp
++++ b/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.cpp
+@@ -111,6 +111,8 @@ HermesRuntimeAgentDelegate::HermesRuntimeAgentDelegate(
+           runtimeTargetDelegate,
+           std::move(runtimeExecutor))) {}
+ 
++HermesRuntimeAgentDelegate::~HermesRuntimeAgentDelegate() = default;
++
+ bool HermesRuntimeAgentDelegate::handleRequest(
+     const cdp::PreparsedRequest& req) {
+   return impl_->handleRequest(req);
+diff --git a/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.h b/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.h
+index d38e86358ca2266de08bedcb4629a7ca9ada8ac6..735802995e4bf51a3bc45b3a38a99098a60b915a 100644
+--- a/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.h
++++ b/ReactCommon/hermes/inspector-modern/chrome/HermesRuntimeAgentDelegate.h
+@@ -56,6 +56,8 @@ class HermesRuntimeAgentDelegate : public RuntimeAgentDelegate {
+       HermesRuntimeTargetDelegate& runtimeTargetDelegate,
+       RuntimeExecutor runtimeExecutor);
+ 
++  ~HermesRuntimeAgentDelegate() override;
++
+   /**
+    * Handle a CDP request. The response will be sent over the provided
+    * \c FrontendChannel synchronously or asynchronously.
 diff --git a/third-party-podspecs/fmt.podspec b/third-party-podspecs/fmt.podspec
 index 2f38990e226c13f483aaf1b986302d4094243814..9b02e481e290299be20a6f09c42056ff51695e9b 100644
 --- a/third-party-podspecs/fmt.podspec
@@ -166,56 +257,3 @@ index 2f38990e226c13f483aaf1b986302d4094243814..9b02e481e290299be20a6f09c42056ff
 +    perl -i -pe 's/^#  define FMT_USE_CONSTEVAL 1$/#  define FMT_USE_CONSTEVAL 0/' include/fmt/base.h
 +  SCRIPT
  end
-diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
-index 14f88de035f7657cb267cb834b28c8f108595775..cee524bca80cf86517fb21af413f937b815275f6 100644
---- a/React/Base/Surface/RCTSurface.mm
-+++ b/React/Base/Surface/RCTSurface.mm
-@@ -465,7 +465,7 @@ - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval
-     // right after the semaphore signals.
- 
-     // Atomic variant of `_waitingForMountingStageOnMainQueue = YES;`
--    atomic_fetch_or(&_waitingForMountingStageOnMainQueue, 1);
-+    atomic_exchange(&_waitingForMountingStageOnMainQueue, 1);
-   }
- 
-   dispatch_semaphore_t semaphore;
-@@ -488,7 +488,7 @@ - (BOOL)synchronouslyWaitForStage:(RCTSurfaceStage)stage timeout:(NSTimeInterval
-   auto timeoutOccurred = dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, timeout * NSEC_PER_SEC));
- 
-   // Atomic equivalent of `_waitingForMountingStageOnMainQueue = NO;`.
--  atomic_fetch_and(&_waitingForMountingStageOnMainQueue, 0);
-+  atomic_exchange(&_waitingForMountingStageOnMainQueue, 0);
- 
-   if (!timeoutOccurred) {
-     // Balancing the semaphore.
-@@ -546,7 +546,7 @@ - (void)_mountRootViewIfNeeded
- {
-   if (atomic_load(&_waitingForMountingStageOnMainQueue) && (self.stage & RCTSurfaceStageSurfaceDidInitialLayout)) {
-     // Atomic equivalent of `_waitingForMountingStageOnMainQueue = NO;`.
--    atomic_fetch_and(&_waitingForMountingStageOnMainQueue, 0);
-+    atomic_exchange(&_waitingForMountingStageOnMainQueue, 0);
- 
-     {
-       std::lock_guard<std::mutex> lock(_mutex);
-diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
-index 994e8ad65b6299f5b2898ce67b64cb4a8d03a7f4..287b9344c48279f00684f5ca552cc6b1ed6b7fac 100644
---- a/React/Profiler/RCTProfile.m
-+++ b/React/Profiler/RCTProfile.m
-@@ -445,7 +445,7 @@ BOOL RCTProfileIsProfiling(void)
- void RCTProfileInit(RCTBridge *bridge)
- {
-   // TODO: enable assert JS thread from any file (and assert here)
--  BOOL wasProfiling = atomic_fetch_or(&RCTProfileProfiling, 1);
-+  BOOL wasProfiling = atomic_exchange(&RCTProfileProfiling, 1);
-   if (wasProfiling) {
-     return;
-   }
-@@ -492,7 +492,7 @@ void RCTProfileInit(RCTBridge *bridge)
- void RCTProfileEnd(RCTBridge *bridge, void (^callback)(NSString *))
- {
-   // assert JavaScript thread here again
--  BOOL wasProfiling = atomic_fetch_and(&RCTProfileProfiling, 0);
-+  BOOL wasProfiling = atomic_exchange(&RCTProfileProfiling, 0);
-   if (!wasProfiling) {
-     return;
-   }