From d0ffdb17673eaaa5ae1f2e15c968fc7c6031ecf9 Mon Sep 17 00:00:00 2001
From: jovnc <95868357+jovnc@users.noreply.github.com>
Date: Sun, 8 Mar 2026 00:51:02 +0800
Subject: [PATCH 1/2] Split test workflow into PR and main branch push

---
 .github/workflows/test-pr.yml | 63 ++++++++++++++++++++++++++++++++
 .github/workflows/test.yml    | 67 -----------------------------------
 2 files changed, 63 insertions(+), 67 deletions(-)
 create mode 100644 .github/workflows/test-pr.yml

diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
new file mode 100644
index 0000000..8b9e375
--- /dev/null
+++ b/.github/workflows/test-pr.yml
@@ -0,0 +1,63 @@
+name: Run tests on Git-Mastery (PR)
+
+on:
+  pull_request_target:
+
+permissions:
+  contents: read
+  pull-requests: read
+
+jobs:
+  test-e2e-pr:
+    name: E2E Tests (${{ matrix.os }})
+    # Require manual approval before secrets are exposed to untrusted PR code
+    environment: e2e-test
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.13"]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          # Explicitly check out the PR branch so we build and test the submitted code
+          # pull_request_target checks out the base branch by default
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Build binary
+        run: |
+          pyinstaller --onefile main.py --name gitmastery
+
+      - name: Set binary path (Unix)
+        if: runner.os != 'Windows'
+        run: echo "GITMASTERY_BINARY=${{ github.workspace }}/dist/gitmastery" >> $GITHUB_ENV
+
+      - name: Set binary path (Windows)
+        if: runner.os == 'Windows'
+        run: echo "GITMASTERY_BINARY=${{ github.workspace }}/dist/gitmastery.exe" >> $env:GITHUB_ENV
+
+      - name: Configure Git
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Run E2E tests
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT }}
+        run: |
+          python -m pytest tests/e2e/ -v
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4b2eb4e..0ba10bd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,6 @@
 name: Run tests on Git-Mastery
 
 on:
-  pull_request_target:
   workflow_dispatch:
   push:
     branches:
@@ -12,74 +11,8 @@ permissions:
   pull-requests: read
 
 jobs:
-  test-e2e-pr:
-    name: E2E Tests (${{ matrix.os }})
-    if: github.event_name == 'pull_request_target'
-    # Require manual approval before secrets are exposed to untrusted PR code
-    environment: e2e-test
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.13"]
-
-    steps:
-      - name: Validate GH_PAT secret
-        shell: bash
-        env:
-          GH_PAT: ${{ secrets.GH_PAT }}
-        run: |
-          if [ -z "$GH_PAT" ]; then
-            echo "GH_PAT secret is required to run E2E tests."
-            exit 1
-          fi
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          # Explicitly check out the PR branch so we build and test the submitted code
-          # pull_request_target checks out the base branch by default
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-
-      - name: Build binary
-        run: |
-          pyinstaller --onefile main.py --name gitmastery
-
-      - name: Set binary path (Unix)
-        if: runner.os != 'Windows'
-        run: echo "GITMASTERY_BINARY=${{ github.workspace }}/dist/gitmastery" >> $GITHUB_ENV
-
-      - name: Set binary path (Windows)
-        if: runner.os == 'Windows'
-        run: echo "GITMASTERY_BINARY=${{ github.workspace }}/dist/gitmastery.exe" >> $env:GITHUB_ENV
-
-      - name: Configure Git
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-
-      - name: Run E2E tests
-        env:
-          GH_TOKEN: ${{ secrets.GH_PAT }}
-        run: |
-          python -m pytest tests/e2e/ -v
-
   test-e2e:
     name: E2E Tests (${{ matrix.os }})
-    if: github.event_name != 'pull_request_target' && github.repository == 'git-mastery/app'
     runs-on: ${{ matrix.os }}
 
     strategy:

From 6703a2638f6c189dd9f577558411127860a74d43 Mon Sep 17 00:00:00 2001
From: jovnc <95868357+jovnc@users.noreply.github.com>
Date: Sun, 8 Mar 2026 00:59:20 +0800
Subject: [PATCH 2/2] Clean up test workflows

---
 .github/workflows/test-pr.yml | 11 +++++++++++
 .github/workflows/test.yml    |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
index 8b9e375..b5f601c 100644
--- a/.github/workflows/test-pr.yml
+++ b/.github/workflows/test-pr.yml
@@ -10,6 +10,7 @@ permissions:
 jobs:
   test-e2e-pr:
     name: E2E Tests (${{ matrix.os }})
+    if: github.repository == 'git-mastery/app'
     # Require manual approval before secrets are exposed to untrusted PR code
     environment: e2e-test
     runs-on: ${{ matrix.os }}
@@ -21,6 +22,16 @@ jobs:
         python-version: ["3.13"]
 
     steps:
+      - name: Validate GH_PAT secret
+        shell: bash
+        env:
+          GH_PAT: ${{ secrets.GH_PAT }}
+        run: |
+          if [ -z "$GH_PAT" ]; then
+            echo "GH_PAT secret is required to run E2E tests."
+            exit 1
+          fi
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0ba10bd..6adb171 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,6 @@ on:
 
 permissions:
   contents: read
-  pull-requests: read
 
 jobs:
   test-e2e: