diff --git a/.github/workflows/OSBotify-private-key.asc.gpg b/.github/workflows/OSBotify-private-key.asc.gpg deleted file mode 100644 index 165debeece1c..000000000000 Binary files a/.github/workflows/OSBotify-private-key.asc.gpg and /dev/null differ diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml index 8b9f604fca33..712d3304eb5a 100644 --- a/.github/workflows/cherryPick.yml +++ b/.github/workflows/cherryPick.yml @@ -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: @@ -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: | diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index 1a5c979e990e..eaaafc56998c 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -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: | diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9bb688411c11..60165609e7e8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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: @@ -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: diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml index fddaf0b170d4..fe4eb154855e 100644 --- a/.github/workflows/updateProtectedBranch.yml +++ b/.github/workflows/updateProtectedBranch.yml @@ -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: |