diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml index c88542068b92..90ed0e46661a 100644 --- a/.github/workflows/buildAndroid.yml +++ b/.github/workflows/buildAndroid.yml @@ -171,7 +171,7 @@ jobs: continue-on-error: true uses: actions/upload-artifact@v4 with: - name: ${{ inputs.artifact-prefix }}android-artifact-aab + name: ${{ inputs.artifact-prefix }}android-aab-artifact path: ${{ steps.build.outputs.AAB_PATH }} - name: Upload Android APK artifact @@ -187,5 +187,5 @@ jobs: continue-on-error: true uses: actions/upload-artifact@v4 with: - name: ${{ inputs.artifact-prefix }}android-artifact-sourcemaps + name: ${{ inputs.artifact-prefix }}android-sourcemaps-artifact path: ./android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5790348f28c7..e92a78ba425f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -266,7 +266,7 @@ jobs: if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} uses: actions/upload-artifact@v4 with: - name: android-build-artifact + name: android-hybrid-build-artifact path: ${{ env.aabPath }} - name: Set current App version in Env @@ -583,7 +583,7 @@ jobs: if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} uses: actions/upload-artifact@v4 with: - name: ios-build-artifact + name: ios-hybrid-build-artifact path: ${{ env.ipaPath }} - name: Warn deployers if iOS production deploy failed @@ -690,7 +690,7 @@ jobs: name: Post a Slack message when any platform fails to build or deploy runs-on: ubuntu-latest if: ${{ failure() }} - needs: [buildAndroid, uploadAndroid, submitAndroid, desktop, iOS, web] + needs: [buildAndroid, uploadAndroid, submitAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web] steps: - name: Checkout uses: actions/checkout@v4 @@ -789,12 +789,12 @@ jobs: gh release upload ${{ needs.prep.outputs.APP_VERSION }} --repo ${{ github.repository }} --clobber \ ./android-sourcemaps-artifact/index.android.bundle.map#android-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \ ./android-build-artifact/app-production-release.aab \ - ./android-build-artifact/Expensify-release.aab#Android-HybridApp.aab \ + ./android-hybrid-build-artifact/Expensify-release.aab#Android-HybridApp.aab \ ./desktop-staging-sourcemaps-artifact/desktop-staging-merged-source-map.js.map#desktop-staging-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \ ./desktop-staging-build-artifact/NewExpensify.dmg#NewExpensifyStaging.dmg \ ./ios-sourcemaps-artifact/main.jsbundle.map#ios-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \ ./ios-build-artifact/New\ Expensify.ipa \ - ./ios-build-artifact/Expensify.ipa#iOS-HybridApp.ipa \ + ./ios-hybrid-build-artifact/Expensify.ipa#iOS-HybridApp.ipa \ ./web-staging-sourcemaps-artifact/web-staging-merged-source-map.js.map#web-staging-sourcemap-${{ needs.prep.outputs.APP_VERSION }} \ ./web-staging-build-tar-gz-artifact/webBuild.tar.gz#stagingWebBuild.tar.gz \ ./web-staging-build-zip-artifact/webBuild.zip#stagingWebBuild.zip diff --git a/fastlane/Fastfile b/fastlane/Fastfile index dfaa3920491a..3c85aa5ff3d1 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -428,7 +428,8 @@ platform :ios do app_id: "1:1008697809946:ios:3ffad71f664f2886", dsym_path: ENV[KEY_DSYM_PATH], gsp_path: "./ios/GoogleService-Info.plist", - binary_path: "./ios/Pods/FirebaseCrashlytics/upload-symbols" + # Assuming we are running this from the react-native submodule directory for HybridApp + binary_path: "../iOS/Pods/FirebaseCrashlytics/upload-symbols" ) end