Skip to content

Revert signing of commits of OSBotify #6395

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

Merged
Jag96 merged 10 commits into from
Nov 22, 2021
Merged

Revert signing of commits of OSBotify #6395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
384e054
Revert "Update one more instance of GITHUB_TOKEN to use OS_BOTIFY_TOKEN"
AndrewGable Nov 22, 2021
ddf5685
Revert "Checkout Cherry Pick using OS_BOTIFY_TOKEN"
AndrewGable Nov 22, 2021
2212d55
Revert "add name to cherryPick usage"
AndrewGable Nov 22, 2021
df7625d
Revert "specify name"
AndrewGable Nov 22, 2021
da76e95
Revert "update deploy workflow"
AndrewGable Nov 22, 2021
fbcf4c6
Revert "update other botify workflow"
AndrewGable Nov 22, 2021
9be69d8
Revert "sign botify commits for cp workflow"
AndrewGable Nov 22, 2021
78c2d4f
Revert "Import from the right directory"
AndrewGable Nov 22, 2021
9bde22a
Revert "Add private key"
AndrewGable Nov 22, 2021
ece3566
Revert "Add changes to commit and git config"
AndrewGable Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .github/workflows/OSBotify-private-key.asc.gpg
View file
Open in desktop
Binary file not shown.
22 changes: 2 additions & 20 deletions .github/workflows/cherryPick.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: main
token: ${{ secrets.OS_BOTIFY_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}

- uses: softprops/turnstyle@8db075d65b19bf94e6e8687b504db69938dc3c65
with:
Expand Down Expand Up @@ -67,25 +67,7 @@ jobs:
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
ref: staging
token: ${{ secrets.OS_BOTIFY_TOKEN }}

- name: Decrypt Botify GPG key
if: github.actor == 'OSBotify'
run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg
env:
LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}

- name: Import Botify GPG Key
if: github.actor == 'OSBotify'
run: cd .github/workflows && gpg --import OSBotify-private-key.asc

- name: Set up git for Botify
if: github.actor == 'OSBotify'
run: |
git config user.signingkey DBF63700F60F5530
git config commit.gpgsign true
git config user.name OSBotify
git config user.email infra+osbotify@expensify.com
token: ${{ secrets.GITHUB_TOKEN }}

- name: Create branch for new pull request
run: |
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/createNewVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,12 @@ jobs:
poll-interval-seconds: 10
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Decrypt GPG key
run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg
env:
LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}

- name: Import the GPG Key
run: cd .github/workflows && gpg --import OSBotify-private-key.asc

- name: Set up git
run: |
git fetch
git checkout main
git config user.signingkey DBF63700F60F5530
git config commit.gpgsign true
git config user.name OSBotify
git config user.email infra+osbotify@expensify.com

- name: Create new branch
run: |
Expand Down
23 changes: 2 additions & 21 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,9 @@ jobs:
id: isAutomatedPullRequest
run: echo "::set-output name=IS_AUTOMERGE_PR::${{ steps.getMergedPullRequest.outputs.author == 'OSBotify' }}"

setupGit:
runs-on: ubuntu-latest
needs: validate
steps:
- name: Decrypt Botify GPG key
run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg
env:
LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}

- name: Import Botify GPG Key
run: cd .github/workflows && gpg --import OSBotify-private-key.asc

- name: Set up git for Botify
run: |
git config user.signingkey DBF63700F60F5530
git config commit.gpgsign true
git config user.name OSBotify
git config user.email infra+osbotify@expensify.com

deployStaging:
runs-on: ubuntu-latest
needs: [validate, setupGit]
needs: validate
if: ${{ fromJSON(needs.validate.outputs.isAutomatedPullRequest) && github.ref == 'refs/heads/staging' }}

steps:
Expand All @@ -61,7 +42,7 @@ jobs:

deployProduction:
runs-on: ubuntu-latest
needs: [validate, setupGit]
needs: validate
if: ${{ fromJSON(needs.validate.outputs.isAutomatedPullRequest) && github.ref == 'refs/heads/production' }}

steps:
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/updateProtectedBranch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,6 @@ jobs:
- name: Set New Version
run: echo "NEW_VERSION=$(npm run print-version --silent)" >> $GITHUB_ENV

- name: Decrypt Botify GPG key
run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg
env:
LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}

- name: Import Botify GPG Key
run: cd .github/workflows && gpg --import OSBotify-private-key.asc

- name: Set up git for Botify
run: |
git config user.signingkey DBF63700F60F5530
git config commit.gpgsign true
git config user.name OSBotify
git config user.email infra+osbotify@expensify.com

- name: Create temporary branch to resolve conflicts
if: ${{ contains(fromJSON('["staging", "production"]'), github.event.inputs.TARGET_BRANCH) }}
run: |
Expand Down