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

[No QA] Ensure bundle version strings are compatible before auto-merging CP PR #6611

Merged
merged 6 commits into from
Dec 16, 2021

Conversation

Jag96
Copy link
Contributor

@Jag96 Jag96 commented Dec 7, 2021

@AndrewGable @roryabraham will you please review this?

Details

This PR updates our CP workflow to ensure that auto-merge PRs won't merge if the bundleVersion string and shortBundleVersion strings aren't compatible. This PR is a revert of #6350, which reverted the initial PR here: #6199.

Compatible bundle version strings: 1.1.1 and 1.1.1.0
Incompatible bundle version strings: 1.1.1 and 1.1.0.0

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/178225

Tests

To test this we'll merge this PR and then CP a dummy change to ensure that there are no CP flow regressions. I also tested this in another public repo here to confirm everything worked as expected w/ GH actions on an ubuntu box (see these action runs)

QA Steps

None

Tested On

N/A

@Jag96 Jag96 self-assigned this Dec 7, 2021
@Jag96 Jag96 changed the title Revert "Revert "[No QA] Ensure bundle version strings are compatible before auto-merging CP PR"" [No QA] Ensure bundle version strings are compatible before auto-merging CP PR Dec 7, 2021
@Jag96 Jag96 marked this pull request as ready for review December 9, 2021 00:15
@Jag96 Jag96 requested a review from a team as a code owner December 9, 2021 00:15
@MelvinBot MelvinBot requested review from nkuoch and removed request for a team December 9, 2021 00:15
@AndrewGable
Copy link
Contributor

So while I agree with this logic:

Compatible bundle version strings: 1.1.1 and 1.1.1.0
Incompatible bundle version strings: 1.1.1 and 1.1.0.0

I thought the issue was we submitted a 1.1.1, it gets approved, then we submit another 1.1.1 when we need to submit a 1.1.2? Is that wrong?

@Jag96
Copy link
Contributor Author

Jag96 commented Dec 14, 2021

I thought the issue was we submitted a 1.1.1, it gets approved, then we submit another 1.1.1 when we need to submit a 1.1.2? Is that wrong?

I think you're referring to this comment which was moved to https://github.com/Expensify/Expensify/issues/178492. The issue we're fixing here is detailed in https://github.com/Expensify/Expensify/issues/178225#issuecomment-960253428, basically the part of the script that is supposed to bump the info.plist version from 1.1.1 to 1.1.2 doesn't happen, but the rest of the workflow continues.

@AndrewGable
Copy link
Contributor

Got it- Makes sense!

@roryabraham roryabraham merged commit aac3f04 into main Dec 16, 2021
@roryabraham roryabraham deleted the revert-6350-revert-6199-joe-check-bundle-version branch December 16, 2021 15:53
@OSBotify
Copy link
Contributor

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

@Jag96
Copy link
Contributor Author

Jag96 commented Dec 16, 2021

Looks like this didn't cause any regressions in https://github.com/Expensify/App/runs/4550113235?check_suite_focus=true 🎉

image

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by @roryabraham in version: 1.1.21-2 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @sketchydroide in version: 1.1.22-0 🚀

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants