Skip to content

🍒 Cherry pick PR #20784 to staging 🍒#20789

Merged
roryabraham merged 3 commits into
stagingfrom
AndrewGable-cherry-pick-staging-20784
Jun 15, 2023
Merged

🍒 Cherry pick PR #20784 to staging 🍒#20789
roryabraham merged 3 commits into
stagingfrom
AndrewGable-cherry-pick-staging-20784

Conversation

@OSBotify

@OSBotify OSBotify commented Jun 15, 2023

Copy link
Copy Markdown
Contributor

🍒 Cherry pick #20784 to staging 🍒

OSBotify and others added 2 commits June 15, 2023 00:33
@OSBotify
Merge pull request #20788 from Expensify/version-BUILD-C779BAE0-2CD3-…
7234cb7 
…40A8-8DCB-C8F744CA9F80

Update version to 1.3.28-2 on main

(cherry picked from commit 23ca9a7)
@deetergp @OSBotify
Merge pull request #20784 from Expensify/Rory-RevertPodsCache
10ef5c9 
[No QA] Revert pod cache

(cherry picked from commit 4343d28)
@OSBotify OSBotify requested a review from a team as a code owner June 15, 2023 00:33
@melvin-bot melvin-bot Bot removed the request for review from a team June 15, 2023 00:34
@OSBotify

OSBotify commented Jun 15, 2023

Copy link
Copy Markdown
Contributor Author

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

@OSBotify

OSBotify commented Jun 15, 2023

Copy link
Copy Markdown
Contributor Author

The CFBundleShortVersionString value in this PR is not compatible with the CFBundleVersion, so cherry picking it will result in an iOS deploy failure.
Please manually resolve the mismatch, push your changes, and then request another reviewer to review and merge.
Important: This mismatch can be caused by a failed Update Protected Branch workflow followed by a manual CP, but please confirm the cause of the mismatch before updating any version numbers.

@AndrewGable AndrewGable requested a review from roryabraham June 15, 2023 00:38
@roryabraham roryabraham merged commit 0481339 into staging Jun 15, 2023
@roryabraham roryabraham deleted the AndrewGable-cherry-pick-staging-20784 branch June 15, 2023 00:39
@OSBotify

OSBotify commented Jun 15, 2023

Copy link
Copy Markdown
Contributor Author

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

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.

@OSBotify

OSBotify commented Jun 16, 2023

Copy link
Copy Markdown
Contributor Author

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@francoisl francoisl francoisl approved these changes
@roryabraham roryabraham roryabraham approved these changes

Assignees

@AndrewGable AndrewGable

Labels

automerge Engineering Hourly KSv2

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@OSBotify @francoisl @roryabraham @AndrewGable @deetergp