From 5a8287bacd9378bfe5b9ba824b2217594724c997 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Thu, 22 Aug 2024 17:15:48 -0400
Subject: [PATCH 1/3] Fix stray usages of ReleaseNotes app token generation

---
 .github/workflows/ci-pipeline.yml            | 12 ------------
 .github/workflows/stable-merge.yml           |  2 +-
 .github/workflows/update-ss13-org-mirror.yml | 11 -----------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 9bf1a44dd6..bd57127dd4 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -2068,12 +2068,6 @@ jobs:
     if: (!(cancelled() || failure())) && needs.deploy-tgs.result == 'success'
     needs: deploy-tgs
     steps:
-      - name: Setup dotnet
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: ${{ env.TGS_DOTNET_VERSION }}.0.x
-          dotnet-quality: ${{ env.TGS_DOTNET_QUALITY }}
-
       - name: gh-pages Clone
         run: git clone -b gh-pages --single-branch "https://git@github.com/tgstation/tgstation-server" $HOME/tgsdox
 
@@ -2097,12 +2091,6 @@ jobs:
           mv $HOME/tgsdox/changelog.yml ./ 2>/dev/null
           dotnet release_notes_bins/Tgstation.Server.ReleaseNotes.dll --generate-full-notes
 
-      - name: Generate App Token
-        run: |
-          dotnet release_notes_bins/Tgstation.Server.ReleaseNotes.dll --token-output-file ${{ runner.temp }}/installation_secret.txt ${{ secrets.TGS_CI_GITHUB_APP_TOKEN_BASE64 }}
-          echo "INSTALLATION_TOKEN=$(cat ${{ runner.temp }}/installation_secret.txt)" >> $GITHUB_ENV
-          rm ${{ runner.temp }}/installation_secret.txt
-
       - name: gh-pages Push
         run: |
           pushd $HOME/tgsdox
diff --git a/.github/workflows/stable-merge.yml b/.github/workflows/stable-merge.yml
index 8c0cc72c2b..f467dac933 100644
--- a/.github/workflows/stable-merge.yml
+++ b/.github/workflows/stable-merge.yml
@@ -37,6 +37,6 @@ jobs:
           allow_forks: true
           user_name: tgstation-server-ci[bot]
           user_email: 161980869+tgstation-server-ci[bot]@users.noreply.github.com
-          push_token: INSTALLATION_TOKEN
+          push_token: ${{ steps.app-token-generation.outputs.token }}
         env:
           GITHUB_TOKEN: ${{ steps.app-token-generation.outputs.token }}
diff --git a/.github/workflows/update-ss13-org-mirror.yml b/.github/workflows/update-ss13-org-mirror.yml
index eb97122843..8fde15074d 100644
--- a/.github/workflows/update-ss13-org-mirror.yml
+++ b/.github/workflows/update-ss13-org-mirror.yml
@@ -35,17 +35,6 @@ jobs:
           fetch-tags: true
           token: ${{ steps.app-token-generation.outputs.token }}
 
-      - name: Build ReleaseNotes
-        run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
-
-      - name: Generate App Token
-        run: |
-          dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --token-output-file ${{ runner.temp }}/installation_secret.txt ${{ secrets.TGS_CI_GITHUB_APP_TOKEN_BASE64 }}
-          echo "INSTALLATION_TOKEN=$(cat ${{ runner.temp }}/installation_secret.txt)" >> $GITHUB_ENV
-          rm ${{ runner.temp }}/installation_secret.txt
-        env:
-          TGS_RELEASE_NOTES_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }}
-
       - name: Push to Spacestation13 Fork
         run: |
           git config user.name "tgstation-server-ci[bot]"

From d1743d58e83984bff60dfbdaff5b73610e84a270 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Thu, 22 Aug 2024 17:30:28 -0400
Subject: [PATCH 2/3] Fix code scanning

---
 .github/workflows/ci-pipeline.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index bd57127dd4..612bfbc3a6 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -80,7 +80,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       security-events: write
-      actions: read
     env:
       TGS_TELEMETRY_KEY_FILE: /tmp/tgs_telemetry_key.txt
     steps:
@@ -92,6 +91,13 @@ jobs:
 
       - name: Checkout (Branch)
         uses: actions/checkout@v4
+        if: github.event_name == 'push' || github.event_name == 'schedule'
+
+      - name: Checkout (PR Merge)
+        uses: actions/checkout@v4
+        if: github.event_name != 'push' && github.event_name != 'schedule'
+        with:
+          ref: "refs/pull/${{ inputs.pull_request_number }}/merge"
 
       - name: Read Current SHA
         id: get-pr-sha

From 71b91b286e4787da67f57250acd9c6a125342f80 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Thu, 22 Aug 2024 18:32:25 -0400
Subject: [PATCH 3/3] Mark .deb service testing as flaky

---
 .github/workflows/scripts/rerunFlakyTests.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/scripts/rerunFlakyTests.js b/.github/workflows/scripts/rerunFlakyTests.js
index 091504979d..ae4cd73d90 100644
--- a/.github/workflows/scripts/rerunFlakyTests.js
+++ b/.github/workflows/scripts/rerunFlakyTests.js
@@ -2,6 +2,7 @@
 const CONSIDERED_STEP_PREFIXES = [
 	"Build", // Nuget.org sporadic issues
 	"Install Native", // apt repository issues
+	"Test Service", // systemd bollocks
 ];
 
 // Otherwise only check jobs that start with these.