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.

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

chore: Chore/resolve xcode changes #9199

Merged
merged 2 commits into from
Apr 11, 2024
Merged

chore: Chore/resolve xcode changes #9199

merged 2 commits into from
Apr 11, 2024

Conversation

Cal-L
Copy link
Contributor

@Cal-L Cal-L commented Apr 11, 2024

Description

This PR is a chore to clean up Xcode diffs when running yarn setup, which also runs pod install on the main branch.

First, it updates outdated pod checksums in the Podfile.lock
Second, it properly names references in the Xcode project file

Related issues

Fixes:

Manual testing steps

  1. Go to this page...

Screenshots/Recordings

Before

After

Example of outdated checksum being automatically updated
image

Properly named reference
image

Pre-merge author checklist

  • I’ve followed MetaMask Coding Standards.
  • I've completed the PR template to the best of my ability
  • I’ve included tests if applicable
  • I’ve documented my code using JSDoc format if applicable
  • I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.

Pre-merge reviewer checklist

  • I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
  • I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

@Cal-L Cal-L requested a review from a team as a code owner April 11, 2024 00:02
Copy link
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@Cal-L Cal-L added No QA Needed/E2E Only Apply this label when your PR does not need any QA effort. needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) Run Smoke E2E Triggers smoke e2e on Bitrise team-mobile-platform labels Apr 11, 2024
Copy link
Contributor

github-actions bot commented Apr 11, 2024

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 0a35afc
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/083580dd-c6ce-42ec-8754-6b0bae6618c3

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

Copy link

sonarcloud bot commented Apr 11, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@NicolasMassart
Copy link
Contributor

I tested it, works fine for xcode files.
Do you know if there's a way to prevent podfile.lock rewrite?
I have this:
image

Copy link
Contributor

@chrisleewilcox chrisleewilcox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Cal-L
Copy link
Contributor Author

Cal-L commented Apr 11, 2024

I tested it, works fine for xcode files. Do you know if there's a way to prevent podfile.lock rewrite? I have this: image

I'll follow up with a way to ensure that the correct pod version is used while running pod install.

@Cal-L Cal-L merged commit 10b435e into main Apr 11, 2024
42 checks passed
@Cal-L Cal-L deleted the chore/resolve-xcode-changes branch April 11, 2024 19:33
@github-actions github-actions bot locked and limited conversation to collaborators Apr 11, 2024
@github-actions github-actions bot removed the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Apr 11, 2024
@metamaskbot metamaskbot added the release-7.21.0 Issue or pull request that will be included in release 7.21.0 label Apr 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
No QA Needed/E2E Only Apply this label when your PR does not need any QA effort. release-7.21.0 Issue or pull request that will be included in release 7.21.0 Run Smoke E2E Triggers smoke e2e on Bitrise team-mobile-platform
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

5 participants