From 9857cc70691aa4162f7ed1287abbf22e22037d42 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 25 Aug 2024 09:04:45 -0400
Subject: [PATCH 1/3] Remove unused envvars

---
 .github/workflows/dependabot-automerge.yml   | 4 ----
 .github/workflows/stable-merge.yml           | 4 ----
 .github/workflows/update-ss13-org-mirror.yml | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml
index 28cb384675..74cb976f8a 100644
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@@ -11,10 +11,6 @@ concurrency:
   group: "dependabot-automerge-${{ github.head_ref || github.run_id }}-${{ github.event_name }}"
   cancel-in-progress: true
 
-env:
-  TGS_DOTNET_VERSION: 8
-  TGS_DOTNET_QUALITY: ga
-
 jobs:
   automerge:
     name: Enable Automerge on Dependabot PRs
diff --git a/.github/workflows/stable-merge.yml b/.github/workflows/stable-merge.yml
index cbc568562c..eddd7258cc 100644
--- a/.github/workflows/stable-merge.yml
+++ b/.github/workflows/stable-merge.yml
@@ -6,10 +6,6 @@ on:
       - master
   workflow_dispatch:
 
-env:
-  TGS_DOTNET_VERSION: 8
-  TGS_DOTNET_QUALITY: ga
-
 jobs:
   master-merge:
     name: Master Merge
diff --git a/.github/workflows/update-ss13-org-mirror.yml b/.github/workflows/update-ss13-org-mirror.yml
index 8fde15074d..175bffcd60 100644
--- a/.github/workflows/update-ss13-org-mirror.yml
+++ b/.github/workflows/update-ss13-org-mirror.yml
@@ -8,10 +8,6 @@ on:
       - "*"
   workflow_dispatch:
 
-env:
-  TGS_DOTNET_VERSION: 8
-  TGS_DOTNET_QUALITY: ga
-
 concurrency:
   group: "ss13-mirror-sync"
   cancel-in-progress: true

From 1fa04f7ec84ede866a4abcc1b0cd17a6016c2f6d Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 25 Aug 2024 09:07:01 -0400
Subject: [PATCH 2/3] Use tgstation-server-ci[bot] for re-run flaky tests

---
 .github/workflows/rerun-flaky-tests.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/rerun-flaky-tests.yml b/.github/workflows/rerun-flaky-tests.yml
index 097d44d65f..6b36c28751 100644
--- a/.github/workflows/rerun-flaky-tests.yml
+++ b/.github/workflows/rerun-flaky-tests.yml
@@ -13,9 +13,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Generate App Token
+        id: app-token-generation
+        uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc
+        with:
+          app_id: ${{ secrets.APP_ID }}
+          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+
       - name: Rerun flaky tests
         uses: actions/github-script@v7
         with:
+          github-token: ${{ steps.app-token-generation.outputs.token }}
           script: |
             const { rerunFlakyTests } = await import('${{ github.workspace }}/.github/workflows/scripts/rerunFlakyTests.js')
             await rerunFlakyTests({ github, context })

From d503bf3c9f435a6bb99e9caec000458fc97b2524 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 25 Aug 2024 09:07:52 -0400
Subject: [PATCH 3/3] Use GitHub token for auto-approve workflow

---
 .github/workflows/auto-approve-dominions-prs.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/auto-approve-dominions-prs.yml b/.github/workflows/auto-approve-dominions-prs.yml
index 14561463a0..58d56c6780 100644
--- a/.github/workflows/auto-approve-dominions-prs.yml
+++ b/.github/workflows/auto-approve-dominions-prs.yml
@@ -19,11 +19,18 @@ jobs:
     if: github.event.pull_request.user.id == 8171642 && !github.event.pull_request.draft && !contains(github.event.pull_request.body, '- [ ]') && (github.event.pull_request.base.repo.owner.login == 'tgstation' || github.event.pull_request.base.repo.owner.login == 'Cyberboss')
     runs-on: ubuntu-latest
     steps:
+      - name: Generate App Token
+        id: app-token-generation
+        uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc
+        with:
+          app_id: ${{ secrets.APP_ID }}
+          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+
       - name: GitHub API Call
         run: |
           curl --request POST \
           --url https://api.github.com/repos/${{github.repository}}/pulls/${{github.event.number}}/reviews \
-          --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
+          --header 'authorization: Bearer ${{ steps.app-token-generation.outputs.token }}' \
           --header 'content-type: application/json' \
           -d '{"event":"APPROVE"}' \
           --fail