diff --git a/.github/workflows/publishReactNativeAndroidArtifacts.yml b/.github/workflows/publishReactNativeAndroidArtifacts.yml index 53c560c1a45d..d3d0c1c0de41 100644 --- a/.github/workflows/publishReactNativeAndroidArtifacts.yml +++ b/.github/workflows/publishReactNativeAndroidArtifacts.yml @@ -30,7 +30,7 @@ jobs: run: echo "HASH=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" - name: Get previous Mobile-Expensify commit hash - if: ${{ matrix.is_hybrid == 'true' }} + if: ${{ matrix.is_hybrid }} id: getOldMobileExpensifyHash run: echo "HASH=$(git rev-parse :Mobile-Expensify)" >> "$GITHUB_OUTPUT" @@ -49,7 +49,7 @@ jobs: run: echo "HASH=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" - name: Get new Mobile-Expensify commit hash - if: ${{ matrix.is_hybrid == 'true' }} + if: ${{ matrix.is_hybrid }} id: getNewMobileExpensifyHash run: echo "HASH=$(git rev-parse :Mobile-Expensify)" >> "$GITHUB_OUTPUT" @@ -70,14 +70,14 @@ jobs: id: didPatchesChange run: | if ! git diff --exit-code --name-only ${{ steps.getOldAppHash.outputs.HASH }}..${{ steps.getNewAppHash.outputs.HASH }} -- patches/react-native+*.patch patches/@react-native+*.patch; then - echo "::notice::Detected changes in patches" + echo "::notice::Detected changes in patches (Standalone NewDot)" echo "DID_PATCHES_CHANGE=true" >> "$GITHUB_OUTPUT" exit 0 fi if [[ '${{ matrix.is_hybrid }}' == 'true' ]]; then if ! git -C Mobile-Expensify diff --exit-code --name-only ${{ steps.getOldMobileExpensifyHash.outputs.HASH }}..${{ steps.getNewMobileExpensifyHash.outputs.HASH }} -- patches/react-native+*.patch patches/@react-native+*.patch; then - echo "::notice::Detected changes in patches" + echo "::notice::Detected changes in patches (HybridApp)" echo "DID_PATCHES_CHANGE=true" >> "$GITHUB_OUTPUT" exit 0 fi @@ -124,9 +124,9 @@ jobs: - name: Build and publish RN artifacts if: ${{ steps.shouldPublish.outputs.SHOULD_PUBLISH == 'true' }} - working-directory: ${{ matrix.is_hybrid == 'true' && 'Mobile-Expensify/Android' || 'android' }} + working-directory: ${{ matrix.is_hybrid && 'Mobile-Expensify/Android' || 'android' }} run: | - echo "Starting artifacts build for ${{ matrix.is_hybrid == 'true' && 'HybridApp' || 'NewDot Standalone' }}" + echo "Starting artifacts build for ${{ matrix.is_hybrid && 'HybridApp' || 'NewDot Standalone' }}" echo "Version: ${{ env.PATCHED_VERSION }}" echo "Commit hash: ${{ env.COMMIT_HASH }}" export ORG_GRADLE_PROJECT_reactNativeArchitectures="armeabi-v7a,arm64-v8a,x86,x86_64" diff --git a/patches/react-native+0.77.1+025.patch b/patches/react-native+0.77.1+025.patch index 60c7e59ce0df..6c60d05cf029 100644 --- a/patches/react-native+0.77.1+025.patch +++ b/patches/react-native+0.77.1+025.patch @@ -19,7 +19,7 @@ index 32287a7..5607be3 100644 + +def patchedVersion = System.getenv("PATCHED_VERSION") +def isHybridBuild = System.getenv("IS_HYBRID_BUILD")?.toBoolean() -+def publishingGroupId = isHybridBuild ? "com.expensify.react-standalone" : "com.expensify.react-hybrid" ++def publishingGroupId = isHybridBuild ? "com.expensify.react-hybrid" : "com.expensify.react-standalone" publishing { publications {