From bd1660eccc26dd8ffae42e780a843a71a1a908f2 Mon Sep 17 00:00:00 2001
From: Toby Jennings <tobyj@slac.stanford.edu>
Date: Thu, 5 Dec 2024 10:07:38 -0600
Subject: [PATCH] Update CI

---
 .github/workflows/ci.yaml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c70f3df..b905e69 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -77,10 +77,13 @@ jobs:
     # but in this case the build will fail with an error since the secret
     # won't be set.
     if: >
-      github.event_name != 'merge_group'
-      && (
-       startsWith(github.ref, 'refs/tags/') ||
-       startsWith(github.head_ref, 'u/tobyj/')
+      (
+        github.event_name == 'pull_request' &&
+        github.event.action != 'closed' &&
+        startsWith(github.head_ref, 'u/tobyj/')
+      ) || (
+        github.event_name == 'push' &&
+        startsWith(github.ref, 'refs/tags/') ||
       )
 
     steps:
@@ -108,7 +111,7 @@ jobs:
     steps:
       - run: >-
           echo "${{ github.head_ref }} merged into ${{ github.ref }}
-          by {{ github.event.pull_request.merged_by.name }} <{{ github.event.pull_request.merged_by.email }}>"
+          by {{ github.event.pull_request.user.name }} <{{ github.event.pull_request.user.email }}>"
       - uses: actions/checkout@v4
 
       - name: Set up UV