Fix flaky pod installs #46316

roryabraham · 2024-07-26T16:50:10Z

Details

I believe this PR will fix the 🏴‍☠️ dreaded 🏴‍☠️ pod install error:

[!] CocoaPods could not find compatible versions for pod "hermes-engine":
  In snapshot (Podfile.lock):
    hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)

  In Podfile:
    hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)

It seems like you've changed the version of the dependency `hermes-engine` and it differs from the version stored in `Pods/Local Podspecs`.
You should run `pod update hermes-engine --no-repo-update` to apply changes made locally.

Rather than writing up a duplicate explanation, I'll simply refer to the code comment.

Fixed Issues

$ n/a

Tests

Open ios/Pods/Local Podspecs/hermes-engine.podspec.json and adjust the version to 0.74.3.
Run cd ios && bundle exec pod install, verify that it fails with the dreaded error
From the root, run scripts/pod-install.sh, verify that it succeeds.

Can't test with AdHoc builds because even though we can trigger a workflow from this branch, when we run checkout the script isn't present.

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

None.

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 · 2024-07-27T06:17:55Z

npm has a package.json file and a package-lock.json file. It seems you updated one without the other, which is usually a sign of a mistake. If you are updating a package make sure that you update the version in package.json then run npm install

roryabraham · 2024-07-27T06:38:41Z

Validate GHA is failing on main, so I created a separate PR to fix it: #46356

melvin-bot · 2024-07-27T06:40:53Z

@ 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 · 2024-07-29T21:59:51Z

@AndrewGable and I chatted about this and decided we'll go with a simpler solution. This PR helped uncover the root cause as partial/stale cache matches with the restore-keys option used in actions/cache. This script might be technically faster, but it's just a lot more code and another system v.s: just removing one line

mountiny · 2024-08-01T22:36:27Z

@roryabraham is this ready for a review now after the change in course? thanks!

roryabraham · 2024-08-02T00:02:59Z

yes, this is ready for review. our attempt at a simpler solution didn't work (example)

mountiny · 2024-08-02T12:52:51Z

We still saw the hermes error on the build for RN0.74 with @MrRefactor so trying to run the adhoc build with this branch https://github.com/Expensify/App/actions/runs/10215905748

roryabraham · 2024-08-02T18:44:21Z

Running the AdHoc build from this branch isn't a real test, because it will check out the code from the RN upgrade branch and then the script won't be there

mountiny · 2024-08-04T12:40:30Z

Yeah I see now from the run :/

mountiny

Changes look good to me although I am not real bash expert

scripts/pod-install.sh

Co-authored-by: Vit Horacek <[email protected]>

mountiny · 2024-08-08T22:45:23Z

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 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 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
- 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.js 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.
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

mountiny

@roryabraham sorry for the delay, now it seems we got some conflicts

# Conflicts: # workflow_tests/assertions/platformDeployAssertions.ts # workflow_tests/assertions/testBuildAssertions.ts

roryabraham · 2024-08-08T23:04:27Z

conflicts resolved

mountiny

Thanks!

OSBotify · 2024-08-08T23:43:11Z

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

Beamanator · 2024-08-14T20:12:49Z

FYI I believe this was deployed to prod yesterday, from this checklist - #47219

hannojg · 2024-08-26T18:55:09Z

Maybe I am missing something, but when running pod-install from our commands I now get this error?

hannojg · 2024-08-26T18:59:05Z

I mean the fix was kinda obvious, but I think we should update the documentation maybe? Or is yq a tool that everyone has installed and my env is just weird?

roryabraham · 2024-08-26T19:12:36Z

Well the script is kind of self-documenting with what you need to do, but if you want to open a documentation PR I'd be happy to review that 👍🏼

idk how standard yq is but it comes preinstalled on all GitHub Actions runners.

roryabraham added 2 commits July 26, 2024 09:34

Add --verbose in platformDeploy as well

0ee3bb0

Add debug info

e1a1db1

roryabraham added the Ready To Build label Jul 26, 2024

roryabraham self-assigned this Jul 26, 2024

This comment has been minimized.

Sign in to view

This comment was marked as outdated.

Sign in to view

Add conditional for local podspecs

7ac3e09

This comment was marked as outdated.

Sign in to view

roryabraham added 8 commits July 26, 2024 11:00

log local podspec

7b919de

Create pod-install script that verifies local podspecs

cf3221d

Add pod install at end of file

1bc94f2

Remove mismatched local podspec

f07ec0e

Add comment for script

f22409b

Remove commented out line

60944f9

Remove verbose

a4b4f80

Use pod-install script in CI

a206ce3

roryabraham changed the title ~~[WIP] Fix flaky pod installs~~ Fix flaky pod installs Jul 27, 2024

roryabraham requested a review from mountiny July 27, 2024 06:17

Remove debug info step

e090f86

roryabraham mentioned this pull request Jul 27, 2024

[No QA] Fix GHA build on main #46356

Merged

50 tasks

roryabraham changed the title ~~Fix flaky pod installs~~ [HOLD] Fix flaky pod installs Jul 27, 2024

roryabraham marked this pull request as ready for review July 27, 2024 06:40

roryabraham requested a review from a team as a code owner July 27, 2024 06:40

melvin-bot bot removed the request for review from a team July 27, 2024 06:40

roryabraham added 2 commits July 26, 2024 23:44

Remove unnecessary blue

ff654b5

Skip the whole thing if no Local Podspecs dir

a9de250

roryabraham closed this Jul 29, 2024

roryabraham deleted the Rory-FixFlakyPodInstalls branch July 29, 2024 22:00

roryabraham restored the Rory-FixFlakyPodInstalls branch August 1, 2024 16:07

roryabraham reopened this Aug 1, 2024

Merge branch 'main' into Rory-FixFlakyPodInstalls

d85276c

mountiny previously approved these changes Aug 4, 2024

View reviewed changes

scripts/pod-install.sh Outdated Show resolved Hide resolved

Update scripts/pod-install.sh

819c5ea

Co-authored-by: Vit Horacek <[email protected]>

roryabraham dismissed mountiny’s stale review via 819c5ea August 4, 2024 18:01

roryabraham requested a review from mountiny August 4, 2024 18:01

mountiny previously approved these changes Aug 8, 2024

View reviewed changes

Merge branch 'main' into Rory-FixFlakyPodInstalls

49ddefa

# Conflicts: # workflow_tests/assertions/platformDeployAssertions.ts # workflow_tests/assertions/testBuildAssertions.ts

roryabraham dismissed mountiny’s stale review via 49ddefa August 8, 2024 23:04

roryabraham requested a review from mountiny August 8, 2024 23:04

mountiny approved these changes Aug 8, 2024

View reviewed changes

roryabraham merged commit 107e7ba into main Aug 8, 2024
19 checks passed

roryabraham deleted the Rory-FixFlakyPodInstalls branch August 8, 2024 23:26

github-actions bot mentioned this pull request Aug 12, 2024

Deploy Checklist: New Expensify 2024-08-12 #47219

Closed

90 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix flaky pod installs #46316

Fix flaky pod installs #46316

roryabraham commented Jul 26, 2024 •

edited

Loading

This comment has been minimized.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

melvin-bot bot commented Jul 27, 2024

roryabraham commented Jul 27, 2024

melvin-bot bot commented Jul 27, 2024

roryabraham commented Jul 29, 2024

mountiny commented Aug 1, 2024

roryabraham commented Aug 2, 2024 •

edited

Loading

mountiny commented Aug 2, 2024

roryabraham commented Aug 2, 2024

mountiny commented Aug 4, 2024

mountiny left a comment

mountiny commented Aug 8, 2024 •

edited

Loading

mountiny left a comment

roryabraham commented Aug 8, 2024

mountiny left a comment

OSBotify commented Aug 8, 2024

Beamanator commented Aug 14, 2024

hannojg commented Aug 26, 2024

hannojg commented Aug 26, 2024 •

edited

Loading

roryabraham commented Aug 26, 2024 •

edited

Loading

Fix flaky pod installs #46316

Fix flaky pod installs #46316

Conversation

roryabraham commented Jul 26, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

This comment has been minimized.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

melvin-bot bot commented Jul 27, 2024

roryabraham commented Jul 27, 2024

melvin-bot bot commented Jul 27, 2024

roryabraham commented Jul 29, 2024

mountiny commented Aug 1, 2024

roryabraham commented Aug 2, 2024 • edited Loading

mountiny commented Aug 2, 2024

roryabraham commented Aug 2, 2024

mountiny commented Aug 4, 2024

mountiny left a comment

Choose a reason for hiding this comment

mountiny commented Aug 8, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

roryabraham commented Aug 8, 2024

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 8, 2024

Beamanator commented Aug 14, 2024

hannojg commented Aug 26, 2024

hannojg commented Aug 26, 2024 • edited Loading

roryabraham commented Aug 26, 2024 • edited Loading

roryabraham commented Jul 26, 2024 •

edited

Loading

roryabraham commented Aug 2, 2024 •

edited

Loading

mountiny commented Aug 8, 2024 •

edited

Loading

hannojg commented Aug 26, 2024 •

edited

Loading

roryabraham commented Aug 26, 2024 •

edited

Loading