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

[No QA]Generate a new GPG key and add it to the .gitignore #6957

Merged
merged 3 commits into from
Dec 30, 2021
Merged

[No QA]Generate a new GPG key and add it to the .gitignore #6957

merged 3 commits into from
Dec 30, 2021

Conversation

AndrewGable
Copy link
Contributor

Details

  1. Created a new GPG key (key ID 367811D53E34168C)
  2. Encrypted it and replaced it in App/.github/workflows/OSBotify-private-key.asc.gpg
  3. Added to the .gitignore .github/workflows/OSBotify-private-key.asc and *.asc to prevent the key from being exposed in future cherry pick PRs with conflicts.

Fixed Issues

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

Tests

  1. Merge this PR
  2. Cherry pick fix: room page layout #6951
  3. Verify no key shows up in the diff when there is a conflict

QA Steps

N/A

@AndrewGable AndrewGable self-assigned this Dec 30, 2021
@AndrewGable AndrewGable requested a review from a team as a code owner December 30, 2021 18:57
@MelvinBot MelvinBot requested review from MonilBhavsar and removed request for a team December 30, 2021 18:57
AndrewGable
AndrewGable commented Dec 30, 2021
View reviewed changes
.gitignore

# GitHub GPG Keys
.github/workflows/OSBotify-private-key.asc
*.asc
Copy link
Contributor Author

Choose a reason for hiding this comment

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

FYI - I verified via find . -name "*.asc" that there are no other keys that would be unintentionally ignored via this.

Copy link
Contributor

@aldo-expensify aldo-expensify Dec 30, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

NAB: Just wondering if .github/workflows/OSBotify-private-key.asc is already included in *.asc

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should be yes, but this is somewhat a safety net just in case we ever change the name of the key. I could remove .github/workflows/OSBotify-private-key.asc if it's too redundant.

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess I was double checking that it was intentional, I'm ok if you want to leave it there to be more explicit as it doesn't cause any problem :P, changing my comment to NAB.

Copy link
Member

Choose a reason for hiding this comment

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

I think it's ok to leave it

@AndrewGable AndrewGable changed the title Generate a new GPG key and add it to the .gitignore [No QA]Generate a new GPG key and add it to the .gitignore Dec 30, 2021
aldo-expensify
aldo-expensify approved these changes Dec 30, 2021
View reviewed changes
Copy link
Contributor

@aldo-expensify aldo-expensify left a comment

Choose a reason for hiding this comment

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

I didn't find any missed DBF63700F60F5530 to replace. Changes look good to me!

rafecolton
rafecolton approved these changes Dec 30, 2021
View reviewed changes
Copy link
Member

@rafecolton rafecolton left a comment

Choose a reason for hiding this comment

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

LGTM

.gitignore

# GitHub GPG Keys
.github/workflows/OSBotify-private-key.asc
*.asc
Copy link
Member

Choose a reason for hiding this comment

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

I think it's ok to leave it

@AndrewGable AndrewGable removed the request for review from MonilBhavsar December 30, 2021 19:47
@AndrewGable
Copy link
Contributor Author

@rafecolton added GPG key on the GitHub side, going to merge and test.

@AndrewGable
Copy link
Contributor Author

The E2E test passed but it's not showing as "completed" for me. Merging.
Screen Shot 2021-12-30 at 12 53 23 PM

@AndrewGable AndrewGable merged commit 098c0a4 into main Dec 30, 2021
@AndrewGable AndrewGable deleted the andrew-new-key branch December 30, 2021 19:53
@botify
Copy link

botify commented Dec 30, 2021

@AndrewGable looks like this was merged without passing tests. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@AndrewGable
Copy link
Contributor Author

@botify see #6957 (comment)

@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.

@OSBotify
Copy link
Contributor

OSBotify commented Jan 4, 2022

🚀 Deployed to staging by @AndrewGable in version: 1.1.24-19 🚀

platform result
🤖 android 🤖 failure ❌
🖥 desktop 🖥 failure ❌
🍎 iOS 🍎 failure ❌
🕸 web 🕸 failure ❌

@OSBotify OSBotify mentioned this pull request Jan 4, 2022
Closed
45 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Jan 4, 2022

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

platform result
🤖 android 🤖 failure ❌
🖥 desktop 🖥 failure ❌
🍎 iOS 🍎 failure ❌
🕸 web 🕸 failure ❌

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

@rafecolton rafecolton rafecolton approved these changes

@aldo-expensify aldo-expensify aldo-expensify approved these changes

Assignees

@AndrewGable AndrewGable

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@AndrewGable @botify @OSBotify @rafecolton @aldo-expensify