meow

.github/workflows/diff-pr.yml

@@ -17,10 +17,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
+      - name: merge base branch
+        run: |
+          git config user.email "ci@localhost"
+          git config user.name "CI"
+          git fetch origin ${{ github.event.pull_request.base.ref }}
+          git merge --no-edit origin/${{ github.event.pull_request.base.ref }}
+
       - name: worktree base for diff
-        run: git worktree add "$RUNNER_TEMP/base" "${{ github.event.pull_request.base.sha }}"
+        run: git worktree add "$RUNNER_TEMP/base" "origin/${{ github.event.pull_request.base.ref }}"
 
       - name: build closures and render diff
         run: |

.github/workflows/flake-update.yml

@@ -5,10 +5,6 @@ on:
     - cron: "17 4 * * *"
   workflow_dispatch:
 
-permissions:
-  contents: write
-  pull-requests: write
-
 jobs:
   update:
     runs-on: nix
@@ -19,7 +15,7 @@ jobs:
 
       - name: open/update PR
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.BOT_TOKEN }}
           API: ${{ github.api_url }}
           REPO: ${{ github.repository }}
         run: |

ci.py

@@ -8,6 +8,7 @@ import re
 import subprocess
 import subprocess_tee
 import sys
+import urllib.error
 import urllib.request
 from collections import Counter
 from pathlib import Path
@@ -26,6 +27,10 @@ def git(*args, check=True):
     return run("git", *args, check=check, capture_output=True)
 
 
+class GiteaError(Exception):
+    pass
+
+
 def gitea(method, path, body=None):
     url = f'{os.environ["API"]}/repos/{os.environ["REPO"]}{path}'
     data = json.dumps(body).encode() if body is not None else None
@@ -37,7 +42,11 @@ def gitea(method, path, body=None):
         with urllib.request.urlopen(req) as resp:
             raw = resp.read()
     except urllib.error.HTTPError as e:
-        sys.exit(f"gitea {method} {path}: {e.code} {e.reason}\n{e.read().decode()}")
+        try:
+            detail = json.loads(e.read()).get("message", e.reason)
+        except (json.JSONDecodeError, UnicodeDecodeError):
+            detail = e.reason
+        raise GiteaError(f"{method} {path}: {e.code} {detail}") from None
     return json.loads(raw) if raw else None
 
 
@@ -466,16 +475,24 @@ def open_pr(args):
 
     host = os.environ["API"].removesuffix("/api/v1")
     auth = base64.b64encode(f'token:{os.environ["GH_TOKEN"]}'.encode()).decode()
-    git("-c", f"http.extraHeader=Authorization: Basic {auth}",
+    push = git("-c", f"http.extraHeader=Authorization: Basic {auth}",
-        "push", "-f", f'{host}/{os.environ["REPO"]}.git', f"HEAD:{args.branch}")
+               "push", "-f", f'{host}/{os.environ["REPO"]}.git', f"HEAD:{args.branch}",
+               check=False)
+    if push.returncode != 0:
+        raise RuntimeError(f"git push failed:\n{push.stderr}")
 
     owner = os.environ["REPO"].split("/")[0]
-    if gitea("GET", f"/pulls?state=open&head={owner}:{args.branch}"):
+    existing = gitea("GET", f"/pulls?state=open&head={owner}:{args.branch}")
+    if existing:
+        print(f"PR #{existing[0]['number']} already open, pushed update")
         return
     labels = [label_id(args.label)] if args.label else []
-    gitea("POST", "/pulls",
+    pr = gitea("POST", "/pulls",
                {"title": args.title, "head": args.branch, "base": args.base,
                 "body": Path(args.body_file).read_text(), "labels": labels})
+    if not pr or "number" not in pr:
+        raise GiteaError(f"POST /pulls: unexpected response: {json.dumps(pr)}")
+    print(f"opened PR #{pr['number']}")
 
 
 def main():