Merge pull request #73 from robust-python/release/2025.12.1

Release/2025.12.1

Author: 56kyle

.github/workflows/merge-demo-feature.yml

@@ -21,6 +21,7 @@ jobs:
           - "robust-maturin-demo"
     with:
       demo_name: ${{ matrix.demo_name }}
+      branch: ${{ github.ref_name }}
 
   merge-demo-feature:
     name: Merge Demo Feature
@@ -30,18 +31,21 @@ jobs:
         demo_name:
           - "robust-python-demo"
           - "robust-maturin-demo"
+    env:
+      GH_TOKEN: ${{ secrets.DEMO_TOKEN }}
     steps:
       - name: Checkout Template
         uses: actions/checkout@v4
         with:
-          repository: ${{ github.repository }}
+          repository: "${{ github.repository_owner }}/cookiecutter-robust-python"
 
       - name: Checkout Demo
         uses: actions/checkout@v4
         with:
           repository: "${{ github.repository_owner }}/${{ inputs.demo_name }}"
           path: ${{ inputs.demo_name }}
           ref: develop
+          token: ${{ secrets.DEMO_TOKEN }}
 
       - name: Set up uv
         uses: astral-sh/setup-uv@v6

.github/workflows/sync-demos.yml

@@ -1,8 +1,10 @@
 name: sync-demo.yml
 on:
-  pull_request:
-    branches:
-      - develop
+  push:
+    branches-ignore:
+      - "main"
+      - "develop"
+      - "release/*"
 
 jobs:
   update-demo:
@@ -15,3 +17,6 @@ jobs:
           - "robust-maturin-demo"
     with:
       demo_name: ${{ matrix.demo_name }}
+      branch: ${{ github.ref_name }}
+    secrets:
+      DEMO_TOKEN: ${{ secrets.DEMO_TOKEN }}

.github/workflows/update-demo.yml

@@ -5,12 +5,19 @@ on:
       demo_name:
         required: true
         type: string
+      branch:
+        required: true
+        type: string
+    secrets:
+      DEMO_TOKEN:
+        required: true
 
 env:
   COOKIECUTTER_ROBUST_PYTHON__DEMOS_CACHE_FOLDER: ${{ github.workspace }}
   COOKIECUTTER_ROBUST_PYTHON__APP_AUTHOR: ${{ github.repository_owner }}
   ROBUST_PYTHON_DEMO__APP_AUTHOR: ${{ github.repository_owner }}
   ROBUST_MATURIN_DEMO__APP_AUTHOR: ${{ github.repository_owner }}
+  GH_TOKEN: ${{ secrets.DEMO_TOKEN }}
 
 jobs:
   update-demo:
@@ -19,15 +26,24 @@ jobs:
       - name: Checkout Template
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           repository: ${{ github.repository }}
           path: "${{ github.workspace }}/cookiecutter-robust-python"
 
+      - name: Configure Git
+        working-directory: "${{ github.workspace }}/cookiecutter-robust-python"
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
       - name: Checkout Demo
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           repository: "${{ github.repository_owner }}/${{ inputs.demo_name }}"
           path: ${{ inputs.demo_name }}
           ref: develop
+          token: ${{ secrets.DEMO_TOKEN }}
 
       - name: Set up uv
         uses: astral-sh/setup-uv@v6
@@ -39,4 +55,4 @@ jobs:
 
       - name: Update Demo
         working-directory: "${{ github.workspace }}/cookiecutter-robust-python"
-        run: "uvx nox -s 'update-demo(${{ inputs.demo_name }})' -- --branch-override ${{ github.head_ref }}"
+        run: "uvx nox -s 'update-demo(${{ inputs.demo_name }})' -- --branch-override ${{ inputs.branch }}"

CHANGELOG.md

@@ -1,3 +1,36 @@
+## v2025.12.1 (2025-12-08)
+
+### Feat
+
+- improve the initial description and add a small blurb linking to the tooling rationale
+- add pin image for use in readme
+- add additional note pointing toward newly made PR url
+- remove extra url marker for stability temporarily
+- add debugging logs marking the location of demo PR's made
+- add GH_TOKEN adjacent to DEMO_TOKEN usages
+- add passthrough of DEMO_TOKEN wherever needed
+- add workflow_call secrets passthrough
+- replace default github token with premade PAT named DEMO_TOKEN
+
+### Fix
+
+- adjust inversed returncode chec
+- swap to just checking return code
+- shrink the scope of text checked for to ensure differing gh cli versions don't differ wording
+- remove decodes that aren't relevant
+- add utf-8 decodes where missing
+- add --global kwargs to git config calls to see if that fixes the error
+- add passthrough for branch name to differentiate branch name source for pull requests and straight pushes
+- adjust syntax to use branches-ignore in sync-demos workflow
+- add git config to update-demo workflow
+- try removing ancestry check to see if it actually matters
+- replace check against commit hash to instead check against HEAD in update-demo workflow
+- remove backup creation of develop branch due to more purposeful checkout existing
+- add two additional fetches that ensure branch actually exists locally so CICD doesn't error on update demo workflow
+- move fetch depth adjustment to the demo instead of the template checkout in the update-demo workflow
+- ensure enough history is fetched in update-demo workflow to verify branch is in sync with remote during CI
+- adjust repository reference in merge-demo-feature.yml
+
 ## v2025.12.0 (2025-12-01)
 
 ### Feat