From 2ee7515f67caf4e3e296f86623a9117f93880ad7 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Sun, 16 Feb 2025 08:22:07 -0800
Subject: [PATCH] Fix release branch builds

---
 .github/workflows/build-common.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index 26167f3ff062..e0ace870417b 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -191,6 +191,8 @@ jobs:
         run: ./gradlew check spdxSbom -x javadoc -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
       - name: Check for jApiCmp diffs
+        # The jApiCmp diff compares current to latest, which isn't appropriate for release branches
+        if: ${{ !startsWith(github.ref_name, 'release/') && !startsWith(github.base_ref, 'release/') }}
         run: |
           # need to "git add" in case any generated files did not already exist
           git add docs/apidiffs