[NoQA] Combine `testBuild` and `testBuildHybrid` by gijoe0295 · Pull Request #62058 · Expensify/App

gijoe0295 · 2025-05-14T21:35:45Z

Explanation of Change

Combine testBuild and testBuildHybrid and clean up testBuildHybrid because we no longer need to build standalone apps.

Fixed Issues

$ #61935
PROPOSAL: #61935 (comment)

Tests

@roryabraham These test cases should be triggered by an internal enginer:

Run the testBuild workflow without HYBRIDAPP_PULL_REQUEST_NUMBER
Run the testBuild workflow without HYBRIDAPP_PULL_REQUEST_NUMBER but with Mobile-Expensify PR specified in this PR description
Run the testBuild workflow with HYBRIDAPP_PULL_REQUEST_NUMBER
Run the testBuild workflow with ANDROID and IOS as false to skip hybrid builds
After each of these above test cases, a comment to indicate starting the build is posted
After each of these above test cases, a comment to list QRs and links for adhoc builds is posted with correct behavior from specified PRs
If HYBRIDAPP_PULL_REQUEST_NUMBER input or Mobile-Expensify PR link was specified, they should be linked in the output comment

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-05-14T22:33:42Z

@rojiphil Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

roryabraham · 2025-05-14T23:30:47Z

@rojiphil no C+ review needed here, thanks

roryabraham

same for everywhere - let's try to standardize on Mobile-Expensify when referring to the submodule rather than "hybrid app"

gijoe0295 · 2025-05-15T05:47:54Z

@roryabraham I just resolved that.

roryabraham · 2025-05-19T17:54:37Z

-        description: Pull Request number for correct placement of apps
+      APP_PULL_REQUEST_NUMBER:
+        description: Expensify/App PR number for correct placement of apps
        required: true


This should no longer be required - there may be times when we have a MOBILE_EXPENSIFY_PULL_REQUEST_NUMBER to test without an App PR

If that's the case, we would only build Hybrid iOS and Android, right? Or will we default to the latest ref on the main branch in Expensify/App repo?

@roryabraham ^

If that's the case, we would only build Hybrid iOS and Android, right?

Correct

Or will we default to the latest ref on the main branch in Expensify/App repo?

Also correct

@roryabraham In this case, where will the build output comment be posted? The Mobile-Expensify PR or the App PR that this workflow is triggered from, or both?

The current logic says that whichever PR was specified, it would be posted to that PR (i.e. if provide both, post to both repo PRs; if App without M-E, post to App...)

App/.github/workflows/testBuildHybrid.yml

Lines 412 to 413 in 8c8b009

- name: Publish links to apps for download on NewDot PR

if: github.event.inputs.APP_PULL_REQUEST_NUMBER != ''

App/.github/workflows/testBuildHybrid.yml

Lines 424 to 425 in 8c8b009

- name: Publish links to apps for download on OldDot PR

if: needs.getOldDotPR.outputs.OLD_DOT_PR != ''

If building from an E/App PR and Mobile-Expensify main, post comment to the E/App PR

If building from E/App main and a Mobile-Expensify PR, post comment to the Mobile-Expensify PR

If building from an E/App PR and a Mobile-Expensify PR, post comment to both PRs

@roryabraham Thanks! Updated.

roryabraham · 2025-05-19T17:55:24Z

test run: https://github.com/Expensify/App/actions/runs/15119867317

github-actions · 2025-05-19T17:55:46Z

🚧 @roryabraham has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2025-05-19T18:35:06Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
Built from App PR #62058.

Android 🤖	iOS 🍎
Android 🤖🔄	iOS 🍎🔄
https://ad-hoc-expensify-cash.s3.amazonaws.com/android//index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios//index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/62058/NewExpensify.dmg	https://62058.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

gijoe0295 · 2025-05-24T00:50:48Z

 env:
  # This variable is needed for fastlane to construct correct path
-  PULL_REQUEST_NUMBER: ${{ github.event.inputs.PULL_REQUEST_NUMBER }}
+  APP_PULL_REQUEST_NUMBER: ${{ inputs.APP_PULL_REQUEST_NUMBER }}


@jnowakow Hi we're refactoring this workflow so that App PR number is now no longer required (we can build a specific Mobile-Expensify PR without an App PR). Can you let me know if we can omit APP_PULL_REQUEST_NUMBER here (it's an empty string)?

cc @roryabraham

And these lines too:

App/.github/workflows/testBuildHybrid.yml

Lines 323 to 327 in 8c8b009

- name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it

run: |

cp .env.staging .env.adhoc

sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc

echo "PULL_REQUEST_NUMBER=${{ github.event.inputs.APP_PULL_REQUEST_NUMBER }}" >> .env.adhoc

I cannot find the usage of this env variable in our codebase. Wonder if it's built into some other external tools?

@jnowakow Hi we're refactoring this workflow so that App PR number is now no longer required (we can build a specific Mobile-Expensify PR without an App PR). Can you let me know if we can omit APP_PULL_REQUEST_NUMBER here (it's an empty string)?

cc @roryabraham

As I remember it's necessary to build correct path to s3 bucket

App/fastlane/Fastfile

Lines 170 to 186 in 59630c3

desc "Upload build to S3"

lane :upload_s3 do

puts "APK path: #{ENV[KEY_GRADLE_APK_PATH]}"

aws_s3(

access_key: ENV['S3_ACCESS_KEY'],

secret_access_key: ENV['S3_SECRET_ACCESS_KEY'],

bucket: ENV['S3_BUCKET'],

region: ENV['S3_REGION'],

apk: ENV[KEY_GRADLE_APK_PATH],

app_directory: "android/#{ENV['PULL_REQUEST_NUMBER']}",

)

puts "Saving S3 outputs in env..."

exportEnvVars({

KEY_S3_APK_PATH => lane_context[SharedValues::S3_HTML_OUTPUT_PATH],

})

end

And these lines too:

App/.github/workflows/testBuildHybrid.yml

Lines 323 to 327 in 8c8b009

- name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it

run: |

cp .env.staging .env.adhoc

sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc

echo "PULL_REQUEST_NUMBER=${{ github.event.inputs.APP_PULL_REQUEST_NUMBER }}" >> .env.adhoc

I cannot find the usage of this env variable in our codebase. Wonder if it's built into some other external tools?

I'm not sure here but I believe it was used to display PR number instead of version inside the app. Maybe it changed over the time.

@jnowakow Thanks a lot! Your answer is precious to me.

gijoe0295 · 2025-05-31T18:31:14Z

@roryabraham Summarize of the changes

App and Mobile-Expensify PRs are all optional and default to main branch
If App PR is not specified, only build iOS & Android apps and the build output comment only includes iOS and Android apps
The build started/output comment would be posted to whichever PR was provided. If none of them were specified (all from main branch), post to E/App PR. That's what you said here [NoQA] Combine testBuild and testBuildHybrid #62058 (comment)

roryabraham · 2025-06-04T23:35:06Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

OSBotify · 2025-06-04T23:44:40Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-06-05T21:43:15Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.1.60-1 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

github-actions · 2025-06-09T14:27:05Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.1.61-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

github-actions · 2025-06-09T14:59:58Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.1.62-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

github-actions · 2025-06-09T16:31:09Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.1.62-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

combine testBuild and testHybridApp

3274ee9

gijoe0295 changed the title ~~[No QA] Combine testBuild and testHybridApp~~ [No QA] Combine testBuild and testHybridBuild May 14, 2025

gijoe0295 changed the title ~~[No QA] Combine testBuild and testHybridBuild~~ [No QA] Combine testBuild and testBuildHybrid May 14, 2025

gijoe0295 added 6 commits May 15, 2025 04:49

update postTestBuildComment script to include hybridapp pr

94c61e8

update deploy docs

afa3b2b

fix action lint

6212468

remove testBuildHybrid.yml

5d831b0

update unit test

4979e44

update unit test

7593926

gijoe0295 changed the title ~~[No QA] Combine testBuild and testBuildHybrid~~ [NoQA] Combine testBuild and testBuildHybrid May 14, 2025

gijoe0295 added 2 commits May 15, 2025 05:13

update unit test

04b1f8f

update unit test

68e0434

gijoe0295 marked this pull request as ready for review May 14, 2025 22:33

gijoe0295 requested a review from a team as a code owner May 14, 2025 22:33

melvin-bot Bot requested a review from rojiphil May 14, 2025 22:33

melvin-bot Bot removed the request for review from a team May 14, 2025 22:33

roryabraham requested review from roryabraham and removed request for rojiphil May 14, 2025 23:30

roryabraham requested changes May 14, 2025

View reviewed changes

consistently use Mobile-Expensify instead of OldDot or HybridApp

c923407

roryabraham requested changes May 19, 2025

View reviewed changes

gijoe0295 added 2 commits May 20, 2025 05:25

Merge branch 'main' of github.com:gijoe0295/App into gijoe/61935

725d62d

Merge branch 'main' of github.com:gijoe0295/App into gijoe/61935

44c92c5

gijoe0295 commented May 24, 2025

View reviewed changes

make App PR optional

e20181b

This comment was marked as outdated.

Sign in to view

gijoe0295 added 7 commits May 24, 2025 09:01

update unit test

ef32eb0

fix unit test

1b6cffb

update ut

4c94eac

fix ut

48a17c8

Merge branch 'main' of github.com:gijoe0295/App into gijoe/61935

921c7b4

fix test

6173d79

post comment to E/App PR if none was provided

a5cf38a

roryabraham reviewed Jun 2, 2025

View reviewed changes

Comment thread .github/workflows/postBuildStartedComment.yml Outdated

gijoe0295 added 6 commits June 5, 2025 01:25

Merge branch 'main' of github.com:gijoe0295/App into gijoe/61935

ad4994a

remove postBuildStartedComment.yml

df6249a

revert env name change

4e6751e

correctly export .env.adhoc variables

922432b

correctly use env var

3b36bda

fallback incase not provide APP_PR_NUMBER

57d8a9c

roryabraham approved these changes Jun 4, 2025

View reviewed changes

roryabraham merged commit 1a4d1e4 into Expensify:main Jun 4, 2025
17 of 18 checks passed

github-actions Bot mentioned this pull request Jun 5, 2025

Deploy Checklist: New Expensify 2025-06-05 #63609

Closed

65 tasks

melvin-bot Bot mentioned this pull request Jun 6, 2025

[Due for payment 2025-06-16] [Due for payment 2025-06-13] Combine testBuild and testBuildHybrid #61935

Closed

gijoe0295 mentioned this pull request Jun 9, 2025

Fix: On tapping device back button to close troubleshoot box from LHN, navigated out of site #62345

Merged

51 tasks

	- name: Publish links to apps for download on NewDot PR
	if: github.event.inputs.APP_PULL_REQUEST_NUMBER != ''

	- name: Publish links to apps for download on OldDot PR
	if: needs.getOldDotPR.outputs.OLD_DOT_PR != ''

	- name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
	run: \|
	cp .env.staging .env.adhoc
	sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
	echo "PULL_REQUEST_NUMBER=${{ github.event.inputs.APP_PULL_REQUEST_NUMBER }}" >> .env.adhoc

	desc "Upload build to S3"
	lane :upload_s3 do
	puts "APK path: #{ENV[KEY_GRADLE_APK_PATH]}"
	aws_s3(
	access_key: ENV['S3_ACCESS_KEY'],
	secret_access_key: ENV['S3_SECRET_ACCESS_KEY'],
	bucket: ENV['S3_BUCKET'],
	region: ENV['S3_REGION'],
	apk: ENV[KEY_GRADLE_APK_PATH],
	app_directory: "android/#{ENV['PULL_REQUEST_NUMBER']}",
	)
	puts "Saving S3 outputs in env..."
	exportEnvVars({
	KEY_S3_APK_PATH => lane_context[SharedValues::S3_HTML_OUTPUT_PATH],
	})
	end

Conversation

gijoe0295 commented May 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 14, 2025

Uh oh!

roryabraham commented May 14, 2025

Uh oh!

roryabraham left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gijoe0295 commented May 15, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gijoe0295 May 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

roryabraham commented May 19, 2025

Uh oh!

github-actions Bot commented May 19, 2025

Uh oh!

github-actions Bot commented May 19, 2025

Uh oh!

gijoe0295 May 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gijoe0295 May 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as outdated.

gijoe0295 commented May 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

roryabraham commented Jun 4, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Jun 4, 2025

Uh oh!

github-actions Bot commented Jun 5, 2025

Uh oh!

github-actions Bot commented Jun 9, 2025

Uh oh!

github-actions Bot commented Jun 9, 2025

Uh oh!

github-actions Bot commented Jun 9, 2025

gijoe0295 commented May 14, 2025 •

edited

Loading

gijoe0295 May 19, 2025 •

edited

Loading

gijoe0295 May 24, 2025 •

edited

Loading

gijoe0295 May 24, 2025 •

edited

Loading

gijoe0295 commented May 31, 2025 •

edited

Loading