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

🍒 Cherry pick PR #9272 to staging 🍒 #9304

Merged
merged 3 commits into from
Jun 2, 2022
Merged

🍒 Cherry pick PR #9272 to staging 🍒 #9304

merged 3 commits into from
Jun 2, 2022

Conversation

OSBotify
Copy link
Contributor

@OSBotify OSBotify commented Jun 2, 2022

🍒 Cherry pick #9272 to staging 🍒

OSBotify and others added 2 commits June 2, 2022 22:56
@OSBotify
Merge pull request #9303 from Expensify/version-BUILD-d27bb4e1abbbf02…
fd8aa64 
…cf0f10d12f1776b6298e4c5d1

Update version to 1.1.71-1 on main

(cherry picked from commit 8a55d20)
@roryabraham @OSBotify
Merge pull request #9272 from Expensify/version-PATCH-14176c54bfdc5c4…
a5c63d3 
…a0d92d05759471c35e3e6aa97

(cherry picked from commit d27bb4e)
@OSBotify OSBotify requested a review from a team as a code owner June 2, 2022 22:56
@melvin-bot melvin-bot bot removed the request for review from a team June 2, 2022 22:56
@OSBotify
Copy link
Contributor Author

OSBotify commented Jun 2, 2022

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
Copy link
Contributor Author

OSBotify commented Jun 2, 2022

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 merged commit 8edfc64 into staging Jun 2, 2022
@AndrewGable AndrewGable deleted the OSBotify-cherry-pick-staging-9272 branch June 2, 2022 23:11
@OSBotify
Copy link
Contributor Author

OSBotify commented Jun 3, 2022

🚀 Cherry-picked to staging by @AndrewGable in version: 1.1.71-1 🚀

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
Copy link
Contributor Author

OSBotify commented Jun 6, 2022

🚀 Deployed to production by @yuwenmemon in version: 1.1.71-2 🚀

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

@AndrewGable AndrewGable AndrewGable approved these changes

Assignees

@roryabraham roryabraham

Labels
automerge Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

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