Skip to content

Branch dance! - #20791

Merged
roryabraham merged 45 commits into
mainfrom
Rory-UseTheForce
Jun 23, 2023
Merged

Branch dance!#20791
roryabraham merged 45 commits into
mainfrom
Rory-UseTheForce

Conversation

@roryabraham

@roryabraham roryabraham commented Jun 15, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Details

This PR updates the fundamental git logic of our CI/CD.

Up until this PR, main is merged into staging and then staging is merged into production. This PR changes that such that, staging is deleted and re-created from main. production is deleted and re-created from staging. This fixes some fundamental issues with our deploy process (see linked issues).

As an added bonus, we no longer need to create pull requests in order for OSBotify to manage branches and cherry-picks. This will be faster and more reliable.

Fixed Issues

$ #10214
$ https://github.com/Expensify/Expensify/issues/280286

Tests

Wrote some automated tests. We'll have to battle-test this over the course of a few deploy cycles

We also need to update the branch protections for OSBotify to make this possible.

  • Verify that no errors appear in the JS console

Offline tests

n/a

QA Steps

None.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android / native
    • Android / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
    • MacOS / Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
Mobile Web - Chrome
Mobile Web - Safari
Desktop
iOS
Android

@roryabraham roryabraham self-assigned this Jun 15, 2023
roryabraham added 28 commits June 14, 2023 23:49
@roryabraham
Fix checkout in createNewVersion
3aa0723
@roryabraham
Dont use updateProtectedBranch from createNewVersion
4cb2058
@roryabraham
Dont use updateProtectedBranch from finishReleaseCycle
50f61b0
@roryabraham
Fix GPG password
e7d7730
@roryabraham
Remove updateProtectedBranch from preDeploy
b0e9828
@roryabraham
Remove updateProtectedBranch from finishReleaseCycle
7d1e4e6
@roryabraham
Remove unused updateProtectedBranch action
2ff4c95
@roryabraham
Update documentation
8fa0fce
@roryabraham
Simplify createNewVersion by lifting turnstyle up
49658ef
@roryabraham
Update tests to accurate represent new logic
efc10d6
@roryabraham
Cleanup tests a bit
983153d
@roryabraham
Update tests to passing state
9174a34
@roryabraham
Simplify getPullRequestsMergedBetween implementation
2dcfaad
@roryabraham
Use checkout v3
4294e5a
@roryabraham
Filter out any commits by OSBotify from the checklist
a16e4b9
@roryabraham
Eliminate CPd PRs from next checklist
7e7a37a
@roryabraham
Rebuild GH Actions
8c6ec4e
@roryabraham
Remove dummy command
4b614ba
@roryabraham
Uncomment code
a7eab35
@roryabraham
Fix GitUtilsTest
430bf2f
@roryabraham
Rebuild GH Actions
21248dc
@roryabraham
Remove PR_COUNT variable that seems to be messing up bashhh
8b56f19
@roryabraham
Remove unnecessary setupNode
e42ea37
@roryabraham
Secrets not inputs
246312a
@roryabraham
Add setupNode back for underscore
a6f4a46
@roryabraham
Create utility function for bumping version
6cb914b
@roryabraham
Create utility function for updating protected branch
0766dd6
@roryabraham
Create utility function for merge_pr
28282e6
roryabraham
roryabraham commented Jun 19, 2023
View reviewed changes

@roryabraham roryabraham left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@iwiznia Helped me realize there's a race condition in finishReleaseCycle.yml. We need to guarantee that production is re-created from staging before staging is re-created from main.

@roryabraham

roryabraham commented Jun 21, 2023

Copy link
Copy Markdown
Contributor Author

This is ready for further reviews. I requested the necessary admin changes in the linked issue, so hopefully we can take this off HOLD and test tomorrow

@roryabraham
roryabraham requested a review from mountiny June 21, 2023 21:27
AndrewGable
AndrewGable reviewed Jun 21, 2023
View reviewed changes
Comment thread .github/workflows/finishReleaseCycle.yml Resolved
mountiny
mountiny approved these changes Jun 23, 2023
View reviewed changes

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for addressing my comments

This was referenced Jun 23, 2023
Merged
Merged
@roryabraham roryabraham changed the title [HOLD] Branch dance! Branch dance! Jun 23, 2023
@roryabraham

roryabraham commented Jun 23, 2023

Copy link
Copy Markdown
Contributor Author

Slack context for testing of this change: https://expensify.slack.com/archives/C07J32337/p1687537599544089

@github-actions

github-actions Bot commented Jun 23, 2023

Copy link
Copy Markdown
Contributor

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

@roryabraham
roryabraham merged commit 9c9fa74 into main Jun 23, 2023
@roryabraham
roryabraham deleted the Rory-UseTheForce branch June 23, 2023 16:56
@roryabraham

roryabraham commented Jun 23, 2023

Copy link
Copy Markdown
Contributor Author

https://github.com/Expensify/App/actions/runs/5358693034

@OSBotify

OSBotify commented Jun 23, 2023

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.32-1 🚀

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

@OSBotify OSBotify mentioned this pull request Jun 24, 2023
Closed
45 tasks done
@melvin-bot melvin-bot Bot mentioned this pull request Jun 26, 2023
Closed
@OSBotify

OSBotify commented Jun 26, 2023

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.32-5 🚀

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

@roryabraham roryabraham mentioned this pull request Jun 28, 2023
Merged
57 tasks done
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iwiznia iwiznia iwiznia left review comments
@AndrewGable AndrewGable AndrewGable approved these changes
@luacmartins luacmartins luacmartins approved these changes
@mountiny mountiny mountiny approved these changes
+1 more reviewer
@narefyev91 narefyev91 narefyev91 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@roryabraham roryabraham

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@roryabraham @narefyev91 @OSBotify @iwiznia @AndrewGable @luacmartins @mountiny