Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CP Stg] Add title and artifactName back in ElectronBuilder config #7996

Merged
merged 3 commits into from
Mar 4, 2022
Merged

[CP Stg] Add title and artifactName back in ElectronBuilder config #7996

merged 3 commits into from
Mar 4, 2022

Conversation

roryabraham
Copy link
Contributor

@roryabraham roryabraham commented Mar 4, 2022 •
edited
Loading

cc @kidroca

Details

I just added some electronBuilder configs back that were removed in #7744. Also got rid of an unnecessary directory.

Fixed Issues

$ #7987

Tests

  1. Uninstall the NewExpensify desktop app
  2. Run desktop-build.
  3. Install the bundled .dmg
  4. Open it and make sure it works.
  5. Go to the app menu and make sure the first menu item says About New Expensify and not something else like About chat-expensify-com or something.
  6. Uninstall the NewExpensify desktop app
  7. Run desktop-build-staging
  8. Install the bundled .dmg.
  9. Open it and make sure it works.
  10. Go to the app menu and make sure the first menu item says About New Expensify and not something else like About chat-expensify-com or something.
  • Verify that no errors appear in the JS console

PR Review Checklist

Contributor (PR Author) Checklist

  • I verified the PR has a small number of commits behind main
  • 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 clearly indicated the environment tests should be run in (Staging vs Production)
  • I wrote testing steps that cover success & fail scenarios (if applicable)
  • I included screenshots or videos for tests on all platforms
  • I ran the tests & veryfy they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • MacOS / Desktop
  • I verified there are no console errors related to changes in this PR
  • I followed proper code patterns (see Reviewing the code)
    • I added comments when the code was not self explanatory
    • I put all copy / text shown in the product in all src/languages/* files (if applicable)
    • I followed proper naming convention for platform-specific files (if applicable)
    • I followed style guidelines (in Styling.md) for all style edits I made
    • I followed the JSDocs style guidelines (in STYLE.md)
  • 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 corroborated the UI performance was not affected (the performance is the same than main branch)
  • If I created a new component I verified that a similar component doesn't exist in the codebase

PR Reviewer Checklist

  • I verified the PR has a small number of commits behind main
  • 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 testing environment is mentioned in the test steps
  • I verified testing steps cover success & fail scenarios (if applicable)
  • I checked that screenshots or videos are included for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • MacOS / Desktop
  • I verified there are no console errors related to changes in this PR
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified comments were added when the code was not self explanatory
    • I verified any copy / text shown in the product was added in all src/languages/* files (if applicable)
    • I verified proper naming convention for platform-specific files was followed (if applicable)
    • I verified style guidelines were followed
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components are not impacted by changes in this PR (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 the UI performance was not affected (the performance is the same than main branch)
  • If a new component is created I verified that a similar component doesn't exist in the codebase

QA Steps

Merge this PR and hope that desktop deploys and auto-update are fixed 😅

  • Verify that no errors appear in the JS console

Screenshots

Desktop

image

image

@roryabraham roryabraham self-assigned this Mar 4, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Mar 4, 2022

⚠️ ⚠️ Heads up! This pull request has the CP Staging label. ⚠️ ⚠️
Merging it will cause it to be immediately deployed to staging, even if the open StagingDeployCash deploy checklist is locked.

@roryabraham roryabraham marked this pull request as ready for review March 4, 2022 01:46
@roryabraham roryabraham requested a review from a team as a code owner March 4, 2022 01:46
@MelvinBot MelvinBot requested review from chiragsalian and removed request for a team March 4, 2022 01:46
@AndrewGable AndrewGable merged commit 2a40af5 into main Mar 4, 2022
@AndrewGable AndrewGable deleted the Rory-FixDesktopBuild branch March 4, 2022 01:53
OSBotify pushed a commit that referenced this pull request Mar 4, 2022
@AndrewGable @OSBotify
Merge pull request #7996 from Expensify/Rory-FixDesktopBuild
4f71c95 
[CP Stg] Add title and artifactName back in ElectronBuilder config

(cherry picked from commit 2a40af5)
This was referenced Mar 4, 2022
Merged
Closed
@roryabraham
Copy link
Contributor Author

Damn, it does not seem like this worked 😞

I re-downloaded NewExpensify.dmg from staging and it's still stuck on 1.1.40-2

@kidroca
Copy link
Contributor

kidroca commented Mar 4, 2022

Setting a fixed artifact name like NewExpensify.dmg puts the universal app there
Which takes 2x size because it bundles code for both x64 and arm64 platforms

Left: arm64 | Right: universal
image

@roryabraham can we somehow make it work with 2 .dmg files - one for M1 and one for Intel macs?
If no we should stick with only one platform and remove the rest

  • universal - works natively on both, but is 2x size
  • x64 - works on both, uses Rosetta for M1 mac

@roryabraham roryabraham mentioned this pull request Mar 4, 2022
Closed
@kidroca
Copy link
Contributor

kidroca commented Mar 4, 2022 •
edited
Loading

I re-downloaded NewExpensify.dmg from staging and it's still stuck on 1.1.40-2

How is NewExpensify.dmg getting hosted on staging.new.expensify/NewExpensify.dmg is it copied from a specific path like dist/newExpensify.dmg - this should be changed to desktop-build/NewExpensify.dmg (couldn't find anything on the repo)

You can see multiple logs of

uploading       file=NewExpensify.dmg provider=S3

It seems like each platform create and overwrite the same file

@OSBotify
Copy link
Contributor

OSBotify commented Mar 4, 2022

🚀 Cherry-picked to staging by @AndrewGable in version: 1.1.41-3 🚀

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

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

@kidroca kidroca mentioned this pull request Mar 4, 2022
Merged
@OSBotify
Copy link
Contributor

🚀 Deployed to production by @francoisl in version: 1.1.41-6 🚀

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

@OSBotify OSBotify mentioned this pull request Mar 11, 2022
Closed
@OSBotify OSBotify mentioned this pull request Aug 16, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndrewGable AndrewGable AndrewGable approved these changes

@chiragsalian chiragsalian Awaiting requested review from chiragsalian

Assignees

@roryabraham roryabraham

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@roryabraham @kidroca @OSBotify @AndrewGable