ci: no-op step for cla-check if in merge group (#1682)

canonical · May 14, 2024 · 0062003 · 0062003
1 parent 3f9a94e
commit 0062003
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/cla-check.yaml b/.github/workflows/cla-check.yaml
@@ -1,6 +1,7 @@
 name: cla-check
 on:
   pull_request:
+  merge_group:
 
 jobs:
   cla-check:
@@ -10,3 +11,6 @@ jobs:
         uses: canonical/has-signed-canonical-cla@v1
         # This prevents the action from running on a merge group, where it fails.
         if: ${{ github.event_name != 'merge_group' }}
+      - name: No-Op  # This exists so the job succeeds if the above step doesn't run.
+        run: 'true'
+        if: ${{ github.event_name == 'merge_group' }}