From 28fed7f91bdc35f30e39d19658e0504959eafe99 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Mon, 4 May 2026 18:40:32 -0700
Subject: [PATCH 1/3] Add manual trigger for CI workflow against beta PMS
 release

---
 .github/workflows/ci.yaml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 58046629c..b10edd766 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,7 +4,16 @@
 name: CI
 
 on:
-  workflow_dispatch: ~
+  workflow_dispatch:
+    inputs:
+      release:
+        description: 'PMS Release Channel'
+        required: false
+        default: 'public'
+        type: choice
+        options:
+          - public
+          - beta
   pull_request: ~
   push:
     branches:
@@ -71,17 +80,21 @@ jobs:
       PLEXAPI_AUTH_SERVER_BASEURL: http://127.0.0.1:32400
       PLEXAPI_PLEXAPI_TIMEOUT: "60"
       PLEX_CONTAINER: plexinc/pms-docker
-      PLEX_CONTAINER_TAG: latest
+      PLEX_CONTAINER_TAG: ${{ matrix.release == 'beta' && 'plexpass' || 'latest'}}
     strategy:
       fail-fast: false
       max-parallel: 3
       matrix:
         plex: ['unclaimed', 'claimed']
+        release:
+          - ${{ inputs.release }}
         is-master:
           - ${{ github.ref == 'refs/heads/master' }}
         exclude:
           - is-master: false
             plex: claimed
+          - release: beta
+            plex: unclaimed
     steps:
     - name: Check out code from Github
       uses: actions/checkout@v6
@@ -223,11 +236,15 @@ jobs:
     strategy:
       matrix:
         plex: ['unclaimed', 'claimed']
+        release:
+          - ${{ inputs.release }}
         is-master:
           - ${{ github.ref == 'refs/heads/master' }}
         exclude:
           - is-master: false
             plex: claimed
+          - release: beta
+            plex: unclaimed
     steps:
     - name: Check out code from GitHub
       uses: actions/checkout@v6
@@ -270,4 +287,4 @@ jobs:
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} 
       with:
-        flags: ${{ matrix.plex }}
+        flags: ${{ join(fromJSON(format('["{0}", "{1}"]', matrix.plex, matrix.release)), ',') }}

From 69353586bf2650ccea33f0a4e248f5c0a586d16d Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Mon, 4 May 2026 19:08:14 -0700
Subject: [PATCH 2/3] Set default workflow matrix release to public

---
 .github/workflows/ci.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b10edd766..10eadc754 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -87,7 +87,7 @@ jobs:
       matrix:
         plex: ['unclaimed', 'claimed']
         release:
-          - ${{ inputs.release }}
+          - ${{ inputs.release || 'public' }}
         is-master:
           - ${{ github.ref == 'refs/heads/master' }}
         exclude:
@@ -237,7 +237,7 @@ jobs:
       matrix:
         plex: ['unclaimed', 'claimed']
         release:
-          - ${{ inputs.release }}
+          - ${{ inputs.release || 'public' }}
         is-master:
           - ${{ github.ref == 'refs/heads/master' }}
         exclude:

From 1d61f5e1ef5a09a975c1f97f9a7f34588379d732 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Mon, 4 May 2026 19:08:35 -0700
Subject: [PATCH 3/3] Allow manual trigger of CI tests against PRs

---
 .github/workflows/ci.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 10eadc754..ffa87f48f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -90,9 +90,14 @@ jobs:
           - ${{ inputs.release || 'public' }}
         is-master:
           - ${{ github.ref == 'refs/heads/master' }}
+        is-workflow-dispatch:
+          - ${{ github.event_name == 'workflow_dispatch' }}
         exclude:
+          # For PRs, skip claimed tests unless manually triggered
           - is-master: false
             plex: claimed
+            is-workflow-dispatch: false
+          # Always skip unclaimed beta tests (even for manual triggers)
           - release: beta
             plex: unclaimed
     steps:
@@ -240,9 +245,14 @@ jobs:
           - ${{ inputs.release || 'public' }}
         is-master:
           - ${{ github.ref == 'refs/heads/master' }}
+        is-workflow-dispatch:
+          - ${{ github.event_name == 'workflow_dispatch' }}
         exclude:
+          # For PRs, skip claimed tests unless manually triggered
           - is-master: false
             plex: claimed
+            is-workflow-dispatch: false
+          # Always skip unclaimed beta tests (even for manual triggers)
           - release: beta
             plex: unclaimed
     steps: