From e40e372f3a1cac05542084e52f90b76a775d1c26 Mon Sep 17 00:00:00 2001
From: Samuel Moelius <samuel.moelius@trailofbits.com>
Date: Wed, 24 Jan 2024 21:22:28 -0500
Subject: [PATCH] Consolidate secrets

---
 .github/workflows/dependabot.yml          | 2 +-
 .github/workflows/release.yml             | 2 +-
 .github/workflows/update_dependencies.yml | 4 ++--
 .github/workflows/update_patches.yml      | 4 ++--
 .github/workflows/update_supply_chain.yml | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
index bf635b66..291c40b2 100644
--- a/.github/workflows/dependabot.yml
+++ b/.github/workflows/dependabot.yml
@@ -21,7 +21,7 @@ jobs:
 
       - uses: actions/github-script@v7
         with:
-          github-token: ${{ secrets.PR_GITHUB_TOKEN }}
+          github-token: ${{ secrets.DEPENDABOT_REPO_TOKEN }}
           script: |
             github.rest.issues.createComment({
               issue_number: context.issue.number,
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 15ade8da..669f39f8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,4 +54,4 @@ jobs:
           body_path: body.md
           draft: false
           prerelease: ${{ contains(github.ref, 'pre') || contains(github.ref, 'rc') }}
-          token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
+          token: ${{ secrets.REPO_TOKEN }}
diff --git a/.github/workflows/update_dependencies.yml b/.github/workflows/update_dependencies.yml
index 79bf69b0..32febfc1 100644
--- a/.github/workflows/update_dependencies.yml
+++ b/.github/workflows/update_dependencies.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           # https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs
           # https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#push-using-ssh-deploy-keys
-          ssh-key: ${{ secrets.PR_SSH_KEY }}
+          ssh-key: ${{ secrets.SSH_KEY }}
 
       - name: Install cargo-edit
         run: cargo install cargo-edit
@@ -34,5 +34,5 @@ jobs:
         with:
           title: Update dependencies
           commit-message: Update dependencies
-          token: ${{ secrets.PR_GITHUB_TOKEN }}
+          token: ${{ secrets.REPO_TOKEN }}
           branch-suffix: random
diff --git a/.github/workflows/update_patches.yml b/.github/workflows/update_patches.yml
index 1a4c4c90..8afd14a6 100644
--- a/.github/workflows/update_patches.yml
+++ b/.github/workflows/update_patches.yml
@@ -12,7 +12,7 @@ jobs:
         with:
           # https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs
           # https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#push-using-ssh-deploy-keys
-          ssh-key: ${{ secrets.PR_SSH_KEY }}
+          ssh-key: ${{ secrets.SSH_KEY }}
 
       # smoelius: The next use of `actions/cache` should match what is in ci.yml.
       - uses: actions/cache@v4
@@ -35,5 +35,5 @@ jobs:
         with:
           title: Update patches
           commit-message: Update patches
-          token: ${{ secrets.PR_GITHUB_TOKEN }}
+          token: ${{ secrets.REPO_TOKEN }}
           branch-suffix: random
diff --git a/.github/workflows/update_supply_chain.yml b/.github/workflows/update_supply_chain.yml
index 83a4c1c0..9100bf67 100644
--- a/.github/workflows/update_supply_chain.yml
+++ b/.github/workflows/update_supply_chain.yml
@@ -12,7 +12,7 @@ jobs:
         with:
           # https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs
           # https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#push-using-ssh-deploy-keys
-          ssh-key: ${{ secrets.PR_SSH_KEY }}
+          ssh-key: ${{ secrets.SSH_KEY }}
 
       # smoelius: The next use of `actions/cache` should match what is in ci.yml.
       - uses: actions/cache@v4
@@ -40,5 +40,5 @@ jobs:
         with:
           title: Update supply_chain.json
           commit-message: Update supply_chain.json
-          token: ${{ secrets.PR_GITHUB_TOKEN }}
+          token: ${{ secrets.REPO_TOKEN }}
           branch-suffix: random