From aa7ffda22812f825241d1b1deefd235af54c756b Mon Sep 17 00:00:00 2001
From: Jon Peirce <jon.peirce@gmail.com>
Date: Thu, 5 Mar 2026 09:11:06 +0000
Subject: [PATCH 1/2] Better branch selection during build

---
 .github/workflows/build_docs.yaml | 36 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml
index 774b8d8..efc6c18 100644
--- a/.github/workflows/build_docs.yaml
+++ b/.github/workflows/build_docs.yaml
@@ -47,37 +47,33 @@ jobs:
       with:
         activate-environment: true
 
-    - name: Checkout psychopy (manual choose branch)
-      uses: actions/checkout@v4
-      if : ${{ github.event_name == 'workflow_dispatch' }}
-      with:
-        repository: psychopy/psychopy
-        path: psychopy
-        ref: ${{ github.event.inputs.pp_branch }}
+    - name: Select branch
+      run: |
+        if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+          echo "Manual trigger for branch: ${{ github.event.inputs.pp_branch }}"
+          branch="${{ github.event.inputs.pp_branch }}"
+        else
+          echo "Scheduled trigger, using release branch"
+          branch="release"
+        fi
+        # export for other steps
+        echo "BRANCH=$branch" >> $GITHUB_ENV
 
-    - name: Checkout psychopy (release branch) for scheduled run
+    - name: Checkout psychopy
       uses: actions/checkout@v4
-      if : ${{ github.event_name == 'schedule' }}
+      if : ${{ github.event_name == 'workflow_dispatch' }}
       with:
         repository: psychopy/psychopy
         path: psychopy
-        ref: release
+        ref: ${{ env.BRANCH }}
   
-    - name: Checkout psychopy-docs (manual choose branch)
+    - name: Checkout psychopy-docs
       uses: actions/checkout@v4
       if : ${{ github.event_name == 'workflow_dispatch' }}
       with:
         repository: psychopy/psychopy-docs
         path: docs
-        ref: ${{ github.event.inputs.pp_branch }}
-
-    - name: Checkout psychopy-docs (release branch) for scheduled run
-      uses: actions/checkout@v4
-      if : ${{ github.event_name == 'schedule' }}
-      with:
-        repository: psychopy/psychopy-docs
-        path: docs
-        ref: release
+        ref: ${{ env.BRANCH }}
 
     - name: Install psychopy and dependencies
       working-directory: docs

From b3697653fed29fb55317cc37945566c73cab205a Mon Sep 17 00:00:00 2001
From: Jon Peirce <jon.peirce@gmail.com>
Date: Thu, 5 Mar 2026 09:28:27 +0000
Subject: [PATCH 2/2] Remove unecessary conditional in build action

---
 .github/workflows/build_docs.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml
index efc6c18..f7fc60e 100644
--- a/.github/workflows/build_docs.yaml
+++ b/.github/workflows/build_docs.yaml
@@ -61,7 +61,6 @@ jobs:
 
     - name: Checkout psychopy
       uses: actions/checkout@v4
-      if : ${{ github.event_name == 'workflow_dispatch' }}
       with:
         repository: psychopy/psychopy
         path: psychopy
@@ -69,7 +68,6 @@ jobs:
   
     - name: Checkout psychopy-docs
       uses: actions/checkout@v4
-      if : ${{ github.event_name == 'workflow_dispatch' }}
       with:
         repository: psychopy/psychopy-docs
         path: docs