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]Manually update staging to use new GPG key in cherry pick workflow #6961

Merged
merged 1 commit into from
Dec 30, 2021

Conversation

AndrewGable
Copy link
Contributor

@AndrewGable AndrewGable commented Dec 30, 2021

Details

Due to the way the deploy process works, we do not update the staging branch once the checklists are running, however we do update the GitHub workflow code on merge. This has caused a discrepancy in the workflow code and the GPG key on staging. This will update the key and code to match on staging, allowing us to test following these steps: https://github.com/Expensify/Expensify/issues/190171

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/190171#issuecomment-1003165197

Tests

  1. Merge this PR
  2. Verify the staging branch has the new GPG key
  3. Cherry pick fix: room page layout #6951

QA Steps

N/A

@AndrewGable AndrewGable requested a review from a team as a code owner December 30, 2021 20:32
@AndrewGable AndrewGable self-assigned this Dec 30, 2021
@MelvinBot MelvinBot requested review from MonilBhavsar and removed request for a team December 30, 2021 20:32
@AndrewGable AndrewGable removed the request for review from MonilBhavsar December 30, 2021 20:32
@aldo-expensify aldo-expensify merged commit c85b1be into staging Dec 30, 2021
@aldo-expensify aldo-expensify deleted the andrew-staging-key branch December 30, 2021 20:59
@aldo-expensify
Copy link
Contributor

GPG key has been updated in staging:

Screen Shot 2021-12-30 at 5 59 33 PM

@aldo-expensify
Copy link
Contributor

How do Cherry pick fix: room page layout #6951? Do you manually create a new PR from branch parasharrajat:room-page to stating?

@AndrewGable
Copy link
Contributor Author

AndrewGable commented Dec 30, 2021

@aldo-expensify mobile deployers can run a manual cherry pick here: https://github.com/Expensify/App/actions/workflows/cherryPick.yml

Screen Shot 2021-12-30 at 2 13 05 PM

I've kicked one off here!

@aldo-expensify
Copy link
Contributor

Thanks!

@aldo-expensify
Copy link
Contributor

aldo-expensify commented Dec 30, 2021

It died, right? 😆

Update: oh no, it is fine I think: https://github.com/Expensify/App/pull/6964/files, do you want me to push a commit resolving the conflicts?

@AndrewGable
Copy link
Contributor Author

It did die, but I forgot to delete the branch AndrewGable-cherry-pick-staging-6951 where it previously failed, so I deleted it. Then on re-run it worked! https://github.com/Expensify/App/actions/runs/1638813496

Yes, can you resolve the conflicts and merge the PR?

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by @AndrewGable in version: 1.1.24-8 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jan 4, 2022

🚀 Deployed to production by @francoisl in version: 1.1.24-8 🚀

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.

3 participants