Add Web and Desktop parameters to deploy process by AndrewGable · Pull Request #59477 · Expensify/App

AndrewGable · 2025-04-01T18:20:41Z

Explanation of Change

Adds web and desktop deploy variables and parameters to allow us to continue to test CP to Production project.

Fixed Issues

$ #58868

Tests

Verified that web and desktop worked on staging here: https://github.com/Expensify/App-Test-Fork/actions/runs/14202160716
Verified that web and desktop worked on production here: https://github.com/Expensify/App-Test-Fork/actions/runs/14201102405

Offline tests

N/A

QA Steps

N/A

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
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.
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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

AndrewGable · 2025-04-01T18:20:56Z

On hold to add variables to this repo: https://github.com/Expensify/Expensify/issues/486783

melvin-bot · 2025-04-01T18:31:03Z

@dukenv0307 @ One of you needs to 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

looks good and ultimately NAB because it's a matter of preference, but I'm more a proponent of DRYing things up than having duplicate steps for staging + production. I find that makes workflows easier to read and reason about.

roryabraham · 2025-04-01T18:35:17Z

.github/workflows/deploy.yml

          GCP_GEOLOCATION_API_KEY: ${{ secrets.GCP_GEOLOCATION_API_KEY_PRODUCTION }}
+          S3_BUCKET: ${{ vars.STAGING_S3_BUCKET }}
+
+      - name: Build production desktop app


Why'd you split these steps up?

The S3 bucket name is different between the two. I agree it seems to be a matter of preference as I prefer the separate steps for readability.

I can re-dry it back up.

AndrewGable · 2025-04-02T17:08:17Z

Off hold, ready for review @roryabraham

roryabraham · 2025-04-02T17:10:59Z

.github/workflows/deploy.yml

      - name: Purge Cloudflare cache
-        run: /home/runner/.local/bin/cli4 --verbose --delete hosts=["${{ env.SHOULD_DEPLOY_PRODUCTION != 'true' && 'staging.' || '' }}new.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
+        run: |
+          HOST=${{ env.SHOULD_DEPLOY_PRODUCTION == 'true' && vars.WEB_PRODUCTION_HOST || vars.WEB_STAGING_HOST }}


NAB but you could put the host in a job-level env var

roryabraham · 2025-04-02T17:11:25Z

README.md

 </div>

-#### Table of Contents
+#### Table of Contents!


Should we remove this change?

roryabraham · 2025-04-02T19:44:30Z

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: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

OSBotify · 2025-04-02T20:04:09Z

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

Add Web and Desktop parameters to deploy process (cherry picked from commit 3484450) (CP triggered by AndrewGable)

github-actions · 2025-04-02T20:50:10Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 9.1.22-9 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-04-03T11:41:17Z

🚀 Deployed to production by https://github.com/grgia in version: 9.1.22-10 🚀

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

AndrewGable and others added 16 commits March 24, 2025 13:53

Update when we run deploy

648372e

Add parameters for deskotp builds

83708b8

Update env name

62d9369

Fix prettier and adhoc

8d94e3d

Update version to 9.1.20-3

0ffccf6

Update Mobile-Expensify submodule version to 9.1.20-3

2e89e1c

Update readme!

ce9cab4

Merge branch 'main' into andrew-web-desktop

3123f16

Add more web params

a40ef04

Run a production deploy

1523131

Try to fix lint

b124139

Remove debug

fc84c8b

Revert submodule change

9669723

Merge branch 'main' into andrew-web-desktop

8bc4ce4

Update S3 variable names

b335327

Run a test staging deploy

cd49501

AndrewGable requested a review from roryabraham April 1, 2025 18:20

AndrewGable self-assigned this Apr 1, 2025

AndrewGable marked this pull request as ready for review April 1, 2025 18:30

AndrewGable requested a review from a team as a code owner April 1, 2025 18:30

melvin-bot bot requested review from dukenv0307 and removed request for a team April 1, 2025 18:31

AndrewGable removed the request for review from dukenv0307 April 1, 2025 18:31

Remove debug

ac610ca

roryabraham reviewed Apr 1, 2025

View reviewed changes

AndrewGable added 2 commits April 1, 2025 13:37

DRY up code

1072ac3

Remove debug

14d9432

AndrewGable requested a review from roryabraham April 1, 2025 20:17

AndrewGable changed the title ~~[HOLD] Add Web and Desktop parameters to deploy process~~ Add Web and Desktop parameters to deploy process Apr 2, 2025

roryabraham reviewed Apr 2, 2025

View reviewed changes

AndrewGable added 2 commits April 2, 2025 13:38

Resolve review comments

00966e7

Fix ! too

65c0b6a

AndrewGable requested a review from roryabraham April 2, 2025 19:40

roryabraham approved these changes Apr 2, 2025

View reviewed changes

roryabraham merged commit 3484450 into Expensify:main Apr 2, 2025
18 checks passed

AndrewGable deleted the andrew-web-desktop branch April 2, 2025 19:54

OSBotify pushed a commit that referenced this pull request Apr 2, 2025

Merge pull request #59477 from Expensify/andrew-web-desktop

d4244e7

Add Web and Desktop parameters to deploy process (cherry picked from commit 3484450) (CP triggered by AndrewGable)

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Apr 2, 2025

github-actions bot mentioned this pull request Apr 2, 2025

Deploy Checklist: New Expensify 2025-04-01 #59448

Closed

60 tasks

melvin-bot bot mentioned this pull request Apr 3, 2025

[Due for payment 2025-04-14] [Due for payment 2025-04-10] [Due for payment 2025-04-03] [Due for payment 2025-04-02] [Cherry Pick to Production] Parameterize all platforms #58868

Closed

4 tasks

Conversation

AndrewGable commented Apr 1, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

AndrewGable commented Apr 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melvin-bot bot commented Apr 1, 2025

Uh oh!

roryabraham left a comment

Choose a reason for hiding this comment

Uh oh!

roryabraham Apr 1, 2025

Choose a reason for hiding this comment

Uh oh!

AndrewGable Apr 1, 2025

Choose a reason for hiding this comment

Uh oh!

AndrewGable commented Apr 2, 2025

Uh oh!

roryabraham Apr 2, 2025

Choose a reason for hiding this comment

Uh oh!

roryabraham Apr 2, 2025

Choose a reason for hiding this comment

Uh oh!

AndrewGable Apr 2, 2025

Choose a reason for hiding this comment

Uh oh!

roryabraham commented Apr 2, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Apr 2, 2025

Uh oh!

github-actions bot commented Apr 2, 2025

Uh oh!

github-actions bot commented Apr 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

AndrewGable commented Apr 1, 2025 •

edited

Loading