From 0866491abaca3d63f1967400ff32e0b2e9c89be5 Mon Sep 17 00:00:00 2001
From: make-github-pseudonymous-again
 <5165674+make-github-pseudonymous-again@users.noreply.github.com>
Date: Mon, 27 Jan 2025 10:46:20 +0100
Subject: [PATCH 1/2] :gear: config(ci): Disable `pull_request` trigger for
 `ci:test:deploy`.

The `workflow_run` trigger should be enough.
---
 .github/workflows/ci:test:deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci:test:deploy.yml b/.github/workflows/ci:test:deploy.yml
index 04f7acf57..da2a09f19 100644
--- a/.github/workflows/ci:test:deploy.yml
+++ b/.github/workflows/ci:test:deploy.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
   merge_group:
   workflow_run:
     workflows:

From 0ae8d2044f90e0a6a56e9956c021c06c5b7a1f06 Mon Sep 17 00:00:00 2001
From: make-github-pseudonymous-again
 <5165674+make-github-pseudonymous-again@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:09:28 +0100
Subject: [PATCH 2/2] :gear: config(ci): Cancel `ci:test:deploy` if
 `ci:build:image` was cancelled.

---
 .github/workflows/ci:test:deploy.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/ci:test:deploy.yml b/.github/workflows/ci:test:deploy.yml
index da2a09f19..77f8f5397 100644
--- a/.github/workflows/ci:test:deploy.yml
+++ b/.github/workflows/ci:test:deploy.yml
@@ -32,6 +32,22 @@ jobs:
       - name: Checkout 🛎️
         uses: actions/checkout@v4
 
+      - name: Cancel job if triggering workflow was cancelled
+        if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'cancelled'
+        uses: actions/github-script@v7
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "Cancelling because ci:build:image was cancelled"
+          echo "${GITHUB_TOKEN}" | gh auth login --with-token
+          gh run cancel "${GITHUB_RUN_ID}"
+
+          echo "Waiting for cancellation..."
+          sleep 10
+
+          echo "Workflow cancellation timeout."
+          exit 1
+
       - name: Fail job if triggering workflow did not succeed
         if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion != 'success'
         uses: actions/github-script@v7